From: lempinen Date: Thu, 6 Sep 2012 12:57:26 +0000 (+0000) Subject: Found more issues caused by version changes (refs #3684) X-Git-Tag: simantics-1.7~4^2~4 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=5799de4c61861c270e413b54ba7cfce4f4f507d3;p=simantics%2Fsysdyn.git Found more issues caused by version changes (refs #3684) git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@25670 ac1ea38d-2e2b-0410-8846-a27921b304fc --- diff --git a/org.simantics.sysdyn.ui/adapters.xml b/org.simantics.sysdyn.ui/adapters.xml index d7d140e2..e5efdca7 100644 --- a/org.simantics.sysdyn.ui/adapters.xml +++ b/org.simantics.sysdyn.ui/adapters.xml @@ -10,5 +10,5 @@ VTT Technical Research Centre of Finland - initial API and implementation --> - none 0 fill 1 + none 0 fill 1 \ No newline at end of file diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java index 283655d9..754cd3b6 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java @@ -42,8 +42,8 @@ public class SysdynBrowser extends GraphExplorerView { "http://www.simantics.org/Sysdyn-1.1/Browser", /*"http://www.simantics.org/Operating-1.1/Browser", * Operating interfaces are not functioning properly. They have not been maintained. */ - "http://www.simantics.org/Documentation-1.0/OldBrowser", - "http://www.simantics.org/Image-1.0/Browser")); + "http://www.simantics.org/Documentation-1.1/OldBrowser", + "http://www.simantics.org/Image-1.1/Browser")); private BinaryFunction selectionTransformation = new BinaryFunction() { diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java index 00115826..b2e0e0e2 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java @@ -28,7 +28,7 @@ import org.simantics.ui.workbench.IPropertyPage; */ public class SysdynModelBrowser extends ModelBrowser2 { - final private Set browseContexts = new HashSet(Arrays.asList(SysdynResource.URIs.ModelingBrowseContext, "http://www.simantics.org/Operating-1.1/Browser", "http://www.simantics.org/Image-1.0/Browser")); + final private Set browseContexts = new HashSet(Arrays.asList(SysdynResource.URIs.ModelingBrowseContext, "http://www.simantics.org/Operating-1.1/Browser", "http://www.simantics.org/Image-1.1/Browser")); @Override protected IPropertyPage getPropertyPage() { diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java index 0c77fa90..2652d552 100644 --- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java +++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/nodes/ModelNode.java @@ -75,7 +75,7 @@ public class ModelNode extends AbstractNode implements IDoubleClickabl @Override public String perform(ReadGraph graph) throws DatabaseException { - return graph.getRelatedValue(data, Layer0.getInstance(graph).HasLabel); + return graph.getPossibleRelatedValue(data, Layer0.getInstance(graph).HasLabel); } }, configurationNameSynchronizer); diff --git a/org.simantics.sysdyn/adapters.xml b/org.simantics.sysdyn/adapters.xml index c5cb3a95..74013f11 100644 --- a/org.simantics.sysdyn/adapters.xml +++ b/org.simantics.sysdyn/adapters.xml @@ -26,7 +26,7 @@ class="org.simantics.sysdyn.adapter.ConfigurationVariable" > - @@ -44,7 +44,7 @@ - diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/refactoring/mappingSpec.txt b/org.simantics.sysdyn/src/org/simantics/sysdyn/refactoring/mappingSpec.txt index 41450cba..51835211 100644 --- a/org.simantics.sysdyn/src/org/simantics/sysdyn/refactoring/mappingSpec.txt +++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/refactoring/mappingSpec.txt @@ -21,13 +21,15 @@ http://www.simantics.org/Document-1.1 http://www.simantics.org/Document-1.2 http://www.simantics.org/SelectionView-1.1 http://www.simantics.org/SelectionView-1.2 // Spreadsheet changes +http://www.simantics.org/Spreadsheet-1.2/HasContent http://www.simantics.org/Spreadsheet-1.2/Cell/content http://www.simantics.org/Spreadsheet-1.2/FitRows http://www.simantics.org/Spreadsheet-1.2/Dimensions/fitRows http://www.simantics.org/Spreadsheet-1.2/FitColumns http://www.simantics.org/Spreadsheet-1.2/Dimensions/fitColumns http://www.simantics.org/Spreadsheet-1.2/ColumnCount http://www.simantics.org/Spreadsheet-1.2/Dimensions/columnCount http://www.simantics.org/Spreadsheet-1.2/ColumnLabels http://www.simantics.org/Spreadsheet-1.2/Headers/columnLabels http://www.simantics.org/Spreadsheet-1.2/RowCount http://www.simantics.org/Spreadsheet-1.2/Dimensions/rowCount http://www.simantics.org/Spreadsheet-1.2/ColumnWidths http://www.simantics.org/Spreadsheet-1.2/Headers/columnWidths - + +http://www.simantics.org/Spreadsheet-1.2/ContentOf http://www.simantics.org/Spreadsheet-1.2/Cell/content/Inverse http://www.simantics.org/Spreadsheet-1.2/FitRowsOf http://www.simantics.org/Spreadsheet-1.2/Dimensions/fitRows/Inverse http://www.simantics.org/Spreadsheet-1.2/FitColumnsOf http://www.simantics.org/Spreadsheet-1.2/Dimensions/fitColumns/Inverse http://www.simantics.org/Spreadsheet-1.2/ColumnCountOf http://www.simantics.org/Spreadsheet-1.2/Dimensions/columnCount/Inverse