Reverted documentation changes away from trunk (refs #3884)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@26487 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ontology/Sysdyn ontolgy changes.doc b/org.simantics.sysdyn.ontology/Sysdyn ontolgy changes.doc
new file mode 100644 (file)
index 0000000..2f41a3c
Binary files /dev/null and b/org.simantics.sysdyn.ontology/Sysdyn ontolgy changes.doc differ

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index 2299b42f6efc4bb2fef7d935010a59965c78321c..c4a93709ad77c849edd5029eefd9eeab56778808 100644 (file)
Binary files a/org.simantics.sysdyn.ontology/graph.tg and b/org.simantics.sysdyn.ontology/graph.tg differ

diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
index 9790d620bdd2c718b7b151113ef07ebbe3e3bf93..33c0c64202e3705b21b1c87c1eba8890238e61c1 100644 (file)
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -23,8 +23,8 @@ SYSDYN.ImportedOntologies : PROJ.NamespaceRequirement
         "http://www.simantics.org/Sysdyn-1.1" : L0.URI
         "http://www.simantics.org/Layer0-1.1" : L0.URI
         "http://www.simantics.org/SelectionView-1.2" : L0.URI
-        "http://www.simantics.org/Documentation-1.1" : L0.URI // Experimental documentation tool
-        "http://www.simantics.org/DocumentWorkbench-1.0" : L0.URI // Experimental documentation tool
+//        "http://www.simantics.org/Documentation-1.1" : L0.URI // Experimental documentation tool
+//        "http://www.simantics.org/DocumentWorkbench-1.0" : L0.URI // Experimental documentation tool
                 
 SYSDYN.SharedFunctionOntology <T L0.Ontology
 SYSDYN.SharedModuleOntology <T L0.Ontology      

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index dc0753c93ebdd74687f14a792ce275668dd98f56..d39c13f3a4f0edff9b0d460a7b8a08e27b6e0923 100644 (file)
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -178,12 +178,14 @@
                relationship="right"\r
                relative="org.eclipse.ui.editorss">\r
          </view>\r
+         <!--\r
          <view\r
                id="org.simantics.document.workbench.documentViewer"\r
                minimized="true"\r
                relationship="stack"\r
                relative="org.simantics.sysdyn.ui.chartPanel">\r
          </view>\r
+         -->\r
       </perspectiveExtension>\r
    </extension>\r
    <extension\r
@@ -723,6 +725,7 @@
                   </with>\r
                </visibleWhen>\r
             </command>\r
+            <!--\r
             <command\r
                   commandId="org.simantics.documentation.workbench.newDocumentation"\r
                   icon="platform:/plugin/com.famfamfam.silk/icons/script.png"\r
@@ -740,6 +743,7 @@
                   </with>\r
                </visibleWhen>\r
             </command>\r
+           -->\r
          </menu>\r
          <dynamic\r
                class="org.simantics.ui.contribution.OpenWithMenuContribution"\r
@@ -1381,10 +1385,12 @@
                         args="org.simantics.sysdyn.ui.browser.nodes.PieChartNode"\r
                         property="org.simantics.sysdyn.ui.nodeClass">\r
                   </test>\r
+                  <!--\r
                   <test\r
                         args="org.simantics.document.workbench.browser_old.DocumentationNode"\r
                         property="org.simantics.sysdyn.ui.nodeClass">\r
                   </test>\r
+                  -->\r
                </or>\r
             </with>\r
          </activeWhen>\r
@@ -1420,10 +1426,12 @@
                         args="org.simantics.sysdyn.ui.browser.nodes.FunctionLibraryNode"\r
                         property="org.simantics.sysdyn.ui.nodeClass">\r
                   </test>\r
+                  <!--\r
                   <test\r
                         args="org.simantics.document.workbench.browser_old.DocumentationNode"\r
                         property="org.simantics.sysdyn.ui.nodeClass">\r
                   </test>\r
+                  -->\r
                </or>\r
             </with>\r
          </activeWhen>\r

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 74eeb77d7ec174f8710f1e2db275550ad72257a2..751a84fb7e045c37c76155e6c9d61fec43120203 100644 (file)
--- 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
@@ -51,7 +51,7 @@ public class SysdynBrowser extends GraphExplorerView {
             "http://www.simantics.org/Sysdyn-1.1/Browser",  \r
             /*"http://www.simantics.org/Operating-1.1/Browser", \r
              * Operating interfaces are not functioning properly. They have not been maintained. */ \r
-            "http://www.simantics.org/Documentation-1.1/OldBrowser",\r
+            //"http://www.simantics.org/Documentation-1.1/OldBrowser",\r
             "http://www.simantics.org/Image-1.1/Browser"));    \r
 \r
     private BinaryFunction<Object[], GraphExplorer, Object[]> selectionTransformation = new BinaryFunction<Object[], GraphExplorer, Object[]>() {\r