From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 14 Jun 2012 07:55:43 +0000 (+0000)
Subject: Starting with documentation plugin (refs #3511)
X-Git-Tag: simantics-1.7~30
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=3ffa73d1fe4756b83a3161e78b5e633ff278c668;p=simantics%2Fsysdyn.git

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 8185e6cc..3bae7e60 100644
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 9584de37..66df59bc 100644
--- 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 159a3b70..ae24f88b 100644
--- 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 eb829b17..8638585b 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -178,6 +178,12 @@
                relationship="right"
                relative="org.eclipse.ui.editorss">
          </view>
+         <view
+               id="org.simantics.document.workbench.documentViewer"
+               minimized="true"
+               relationship="stack"
+               relative="org.simantics.sysdyn.ui.chartPanel">
+         </view>
       </perspectiveExtension>
    </extension>
    <extension
@@ -717,6 +723,23 @@
                   </with>
                </visibleWhen>
             </command>
+            <command
+                  commandId="org.simantics.documentation.workbench.newDocumentation"
+                  icon="platform:/plugin/com.famfamfam.silk/icons/application_form.png"
+                  id="org.simantics.sysdyn.ui.browser.newDocumentation"
+                  label="Document"
+                  style="push">
+               <visibleWhen
+                     checkEnabled="true">
+                  <with
+                        variable="selection">
+                     <test
+                           args="org.simantics.document.workbench.browser_old.DocumentationFolder"
+                           property="org.simantics.sysdyn.ui.nodeClass">
+                     </test>
+                  </with>
+               </visibleWhen>
+            </command>
          </menu>
          <dynamic
                class="org.simantics.ui.contribution.OpenWithMenuContribution"
@@ -1212,6 +1235,10 @@
                         args="org.simantics.sysdyn.ui.browser.nodes.PieChartNode"
                         property="org.simantics.sysdyn.ui.nodeClass">
                   </test>
+                  <test
+                        args="org.simantics.document.workbench.browser_old.DocumentationFolder"
+                        property="org.simantics.sysdyn.ui.nodeClass">
+                  </test>
                </or>
             </with>
          </activeWhen>
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 81dca098..283655d9 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,6 +42,7 @@ 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"));    
 
     private BinaryFunction<Object[], GraphExplorer, Object[]> selectionTransformation = new BinaryFunction<Object[], GraphExplorer, Object[]>() {
diff --git a/org.simantics.sysdyn.ui/sysdyn.product b/org.simantics.sysdyn.ui/sysdyn.product
index bf613778..1e756d0e 100644
--- a/org.simantics.sysdyn.ui/sysdyn.product
+++ b/org.simantics.sysdyn.ui/sysdyn.product
@@ -7,9 +7,9 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>-fixerrors
---launcher.XXMaxPermSize
-192m
+      <programArgs>-fixerrors
+--launcher.XXMaxPermSize
+192m
 -data @noDefault</programArgs>
       <vmArgs>-ea  -Xmx768M -Xshare:off</vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
@@ -27,7 +27,7 @@
    </launcher>
 
    <vm>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>
+      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>
    </vm>
 
    <license>