Merge pull request #585 from debrief/hotfix_integration_testing

Hotfix integration testing
debrief · Aug 17, 2017 · 8e84fd4 · 8e84fd4
2 parents ad7f740 + 305b4b6
commit 8e84fd4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/info.limpet.rcp/META-INF/MANIFEST.MF b/info.limpet.rcp/META-INF/MANIFEST.MF
@@ -18,7 +18,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.net,
  org.eclipse.ui.intro,
  org.eclipse.ui.intro.universal,
- org.apache.commons.logging
+ org.apache.commons.logging,
+ org.eclipse.pde.runtime,
+ info.limpet.stackedcharts.ui
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Bundle-Vendor: MWC

diff --git a/info.limpet.rcp/src/info/limpet/rcp/product/Perspective.java b/info.limpet.rcp/src/info/limpet/rcp/product/Perspective.java
@@ -18,6 +18,7 @@
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 
+import info.limpet.stackedcharts.ui.view.StackedChartsView;
 import info.limpet.ui.analysis_view.AnalysisView;
 import info.limpet.ui.data_frequency.DataFrequencyView;
 import info.limpet.ui.heatmap.HeatmapView;
@@ -46,6 +47,8 @@ public void createInitialLayout(IPageLayout layout)
     final IFolderLayout topRight =
         layout.createFolder("topRight", IPageLayout.RIGHT, 0.6f, editorArea);
     topRight.addView(AnalysisView.ID);
+    topRight.addPlaceholder("org.eclipse.pde.runtime.LogView");
+    topRight.addPlaceholder(StackedChartsView.ID);
 
     final IFolderLayout underAnalysis =
         layout.createFolder("underAnalysis", IPageLayout.BOTTOM, 0.7f,
@@ -63,6 +66,7 @@ public void createInitialLayout(IPageLayout layout)
     // and our view shortcuts
     layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
     layout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET);
+    layout.addShowViewShortcut("org.eclipse.pde.runtime.LogView");
     layout.addShowViewShortcut(AnalysisView.ID);
     layout.addShowViewShortcut(DataFrequencyView.ID);
     layout.addShowViewShortcut(XyPlotView.ID);

diff --git a/info.limpet.ui/src/info/limpet/ui/editors/DataManagerEditor.java b/info.limpet.ui/src/info/limpet/ui/editors/DataManagerEditor.java
@@ -97,6 +97,8 @@
 import org.eclipse.ui.part.FileEditorInput;
 import org.osgi.framework.Bundle;
 
+import com.thoughtworks.xstream.converters.ConversionException;
+
 public class DataManagerEditor extends EditorPart
 {
 
@@ -825,6 +827,14 @@ private void load(final IEditorInput input)
           _store = new StoreGroup("Store");
         }
       }
+      catch(ConversionException re)
+      {
+        // ok, log the error
+        log(re);
+
+        // and give us an empty store
+        _store = new StoreGroup("Store");
+      }
       catch (IOException | CoreException e)
       {
         log(e);