Starting with documentation plugin (refs #3511)

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

diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg
index 8185e6cc23e6ced9e888f380ad97437aa17e3792..3bae7e60c2b9d88a5573f6d19dc05936e2069f82 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 9584de37c0429f9f399df38923116e466868edd3..66df59bc26bcf2007205eff7145d674e997cd454 100644 (file)
--- a/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
+++ b/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
@@ -22,6 +22,8 @@ SYSDYN.ImportedOntologies : PROJ.NamespaceRequirement
     PROJ.RequiresNamespace
         "http://www.simantics.org/Sysdyn-1.1" : L0.URI
         "http://www.simantics.org/Layer0-1.0" : L0.URI
+        "http://www.simantics.org/Documentation-1.0" : L0.URI
+        "http://www.simantics.org/SelectionView-1.1" : L0.URI        
         
 SYSDYN.SharedFunctionOntology <T L0.Ontology
 SYSDYN.SharedModuleOntolofgy <T L0.Ontology        

diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
index 159a3b70ae04b2a2b898c6e3bf58d903518a458d..ae24f88b0c37f7324a4a90a53a3ad1d91960f99d 100644 (file)
--- a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
@@ -53,7 +53,9 @@ Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2",
  org.simantics.jfreechart.ontology;bundle-version="0.1.0",
  org.eclipse.ui.forms;bundle-version="3.5.2",
  org.simantics.scenegraph.swing;bundle-version="1.0.0",
- org.eclipse.nebula.widgets.tablecombo;bundle-version="1.0.0"
+ org.eclipse.nebula.widgets.tablecombo;bundle-version="1.0.0",
+ org.simantics.document.ontology2;bundle-version="1.0.0",
+ org.simantics.document.workbench;bundle-version="1.0.0"
 Bundle-Activator: org.simantics.sysdyn.ui.Activator
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.sysdyn.ui.browser.nodes

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index eb829b170dbfad9d2f72b3fa95ed1a3743a41933..8638585b2c44e81aabeb7877e42580ea6cc05dfd 100644 (file)
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -178,6 +178,12 @@
                relationship="right"\r
                relative="org.eclipse.ui.editorss">\r
          </view>\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
       </perspectiveExtension>\r
    </extension>\r
    <extension\r
@@ -717,6 +723,23 @@
                   </with>\r
                </visibleWhen>\r
             </command>\r
+            <command\r
+                  commandId="org.simantics.documentation.workbench.newDocumentation"\r
+                  icon="platform:/plugin/com.famfamfam.silk/icons/application_form.png"\r
+                  id="org.simantics.sysdyn.ui.browser.newDocumentation"\r
+                  label="Document"\r
+                  style="push">\r
+               <visibleWhen\r
+                     checkEnabled="true">\r
+                  <with\r
+                        variable="selection">\r
+                     <test\r
+                           args="org.simantics.document.workbench.browser_old.DocumentationFolder"\r
+                           property="org.simantics.sysdyn.ui.nodeClass">\r
+                     </test>\r
+                  </with>\r
+               </visibleWhen>\r
+            </command>\r
          </menu>\r
          <dynamic\r
                class="org.simantics.ui.contribution.OpenWithMenuContribution"\r
@@ -1212,6 +1235,10 @@
                         args="org.simantics.sysdyn.ui.browser.nodes.PieChartNode"\r
                         property="org.simantics.sysdyn.ui.nodeClass">\r
                   </test>\r
+                  <test\r
+                        args="org.simantics.document.workbench.browser_old.DocumentationFolder"\r
+                        property="org.simantics.sysdyn.ui.nodeClass">\r
+                  </test>\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 81dca09853eff0d9ba7d05c4ed7dc8f54038ff3e..283655d905602ce44929d3eca97a31065fdefba6 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
@@ -42,6 +42,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.0/OldBrowser",\r
             "http://www.simantics.org/Image-1.0/Browser"));    \r
 \r
     private BinaryFunction<Object[], GraphExplorer, Object[]> selectionTransformation = new BinaryFunction<Object[], GraphExplorer, Object[]>() {\r

diff --git a/org.simantics.sysdyn.ui/sysdyn.product b/org.simantics.sysdyn.ui/sysdyn.product
index bf6137784cbd513fb85fb2ce47253882da09b037..1e756d0e00c0be87a8d4c36cf1e58c5fb1eaa64d 100644 (file)
--- a/org.simantics.sysdyn.ui/sysdyn.product
+++ b/org.simantics.sysdyn.ui/sysdyn.product
@@ -7,9 +7,9 @@
    </configIni>\r
 \r
    <launcherArgs>\r
-      <programArgs>-fixerrors\r
---launcher.XXMaxPermSize\r
-192m\r
+      <programArgs>-fixerrors
+--launcher.XXMaxPermSize
+192m
 -data @noDefault</programArgs>\r
       <vmArgs>-ea  -Xmx768M -Xshare:off</vmArgs>\r
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>\r
@@ -27,7 +27,7 @@
    </launcher>\r
 \r
    <vm>\r
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>\r
+      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>\r
    </vm>\r
 \r
    <license>\r