s-case · LeonoraG · Sep 28, 2015 · Oct 22, 2015 · Oct 22, 2015 · Nov 2, 2015
diff --git a/eu.scasefp7.eclipse.core.dependencies.feature/feature.xml b/eu.scasefp7.eclipse.core.dependencies.feature/feature.xml
@@ -3,7 +3,8 @@
       id="eu.scasefp7.eclipse.core.dependencies.feature"
       label="S-CASE Core third-party dependencies"
       version="1.1.1.qualifier"
-      provider-name="S-CASE Consortium">
+      provider-name="S-CASE Consortium"
+      plugin="eu.scasefp7.eclipse.core.ui">
 
    <description url="https://github.com/s-case/s-case-core">
       The dependencies of the S-CASE Core module.

diff --git a/eu.scasefp7.eclipse.core.ui/META-INF/LICENSE b/eu.scasefp7.eclipse.core.ui/META-INF/LICENSE
diff --git a/eu.scasefp7.eclipse.core.ui/META-INF/MANIFEST.MF b/eu.scasefp7.eclipse.core.ui/META-INF/MANIFEST.MF
@@ -13,7 +13,17 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.mylyn.commons.notifications.ui,
  org.eclipse.mylyn.commons.workbench,
  org.eclipse.ui.forms,
+ org.eclipse.debug.core,
  org.eclipse.ui.trace,
+ org.eclipse.core.variables,
+ org.eclipse.equinox.security,
+ org.eclipse.m2e.core,
+ org.eclipse.m2e.maven.runtime,
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.intro,
+ org.eclipse.core.expressions,
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.ui.navigator.resources,
  org.eclipse.equinox.security;bundle-version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: eu.scasefp7.eclipse.core.ui
@@ -22,4 +32,5 @@ Bundle-ClassPath: .
 Bundle-Activator: eu.scasefp7.eclipse.core.ui.Activator
 Bundle-ActivationPolicy: lazy
 Import-Package: eu.scasefp7.eclipse.core.builder,
- eu.scasefp7.eclipse.core.ontology
+ eu.scasefp7.eclipse.core.ontology,
+ org.eclipse.debug.internal.ui
diff --git a/eu.scasefp7.eclipse.core.ui/about.ini b/eu.scasefp7.eclipse.core.ui/about.ini
@@ -0,0 +1,15 @@
+featureImage=icons/s-case-feature.png
+aboutText=S-CASE UML recognizer image import wizard\n\
+\n\
+Frontend to UML recognizer module presented as an Eclipse import wizard. Image files of type JPG, JPEG2000, PNG and BMP are supported. Activity and use case diagrams can be detected. Result is stored in an XMI file and can be automatically opened in an associated editor.\n\
+\n\
+Please visit http://www.scasefp7.eu for more information on the S-CASE project.\n\
+\n\
+Please visit https://github.com/s-case/ for development information on the S-CASE project.\n\
+Please visit https://github.com/s-case/uml-extraction development information on this feature.\n\
+\n\
+(c) Copyright 2015 S-CASE Consortium\n\
+Licensed under the Apache License, Version 2.0\n\
+\n\
+This feature includes imgscalr software developed by the\n\
+The Buzz Media, LLC (https://github.com/thebuzzmedia/imgscalr)\n\
diff --git a/eu.scasefp7.eclipse.core.ui/build.properties b/eu.scasefp7.eclipse.core.ui/build.properties
@@ -1,10 +1,12 @@
-source.. = src/
-output.. = target/classes/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               OSGI-INF/,\
-               contexts.xml,\
-               icons/,\
-               .options
-src.includes = .options
+source.. = src/
+output.. = target/classes/
+bin.includes = plugin.xml,\
+               META-INF/,\
+               .,\
+               OSGI-INF/,\
+               contexts.xml,\
+               icons/,\
+               about.ini,\
+               .options
+src.includes = about.ini,\
+               .options
diff --git a/eu.scasefp7.eclipse.core.ui/icons/artefact-text.png b/eu.scasefp7.eclipse.core.ui/icons/artefact-text.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/artefact.png b/eu.scasefp7.eclipse.core.ui/icons/artefact.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/dashboardButton.png b/eu.scasefp7.eclipse.core.ui/icons/dashboardButton.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/dashboardButton2.png b/eu.scasefp7.eclipse.core.ui/icons/dashboardButton2.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/dashboardCode.png b/eu.scasefp7.eclipse.core.ui/icons/dashboardCode.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/dashboardCodeBackground.png b/eu.scasefp7.eclipse.core.ui/icons/dashboardCodeBackground.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/dashboardDesign.png b/eu.scasefp7.eclipse.core.ui/icons/dashboardDesign.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/dashboardDesignBackground.png b/eu.scasefp7.eclipse.core.ui/icons/dashboardDesignBackground.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/dashboardMashup.png b/eu.scasefp7.eclipse.core.ui/icons/dashboardMashup.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/dashboardMashupBackground.png b/eu.scasefp7.eclipse.core.ui/icons/dashboardMashupBackground.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/dashboardRun.png b/eu.scasefp7.eclipse.core.ui/icons/dashboardRun.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/dashboardRunBackground.png b/eu.scasefp7.eclipse.core.ui/icons/dashboardRunBackground.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/navigatorAction.png b/eu.scasefp7.eclipse.core.ui/icons/navigatorAction.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/navigatorObject.png b/eu.scasefp7.eclipse.core.ui/icons/navigatorObject.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/navigatorRequirement.png b/eu.scasefp7.eclipse.core.ui/icons/navigatorRequirement.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/navigatorRoot.png b/eu.scasefp7.eclipse.core.ui/icons/navigatorRoot.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/navigatorTransition.png b/eu.scasefp7.eclipse.core.ui/icons/navigatorTransition.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/s-case-feature.png b/eu.scasefp7.eclipse.core.ui/icons/s-case-feature.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/s-case_8x8.png b/eu.scasefp7.eclipse.core.ui/icons/s-case_8x8.png
diff --git a/eu.scasefp7.eclipse.core.ui/icons/scaseFolder.png b/eu.scasefp7.eclipse.core.ui/icons/scaseFolder.png
diff --git a/eu.scasefp7.eclipse.core.ui/intropagecontent/introContent.xml b/eu.scasefp7.eclipse.core.ui/intropagecontent/introContent.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<introContent>
+    <page id="root" content="https://raw.githubusercontent.com/s-case/s-case.github.io/master/releasenotes.md"/> <!-- tu je bilo root.xhtml -->
+</introContent>
diff --git a/eu.scasefp7.eclipse.core.ui/intropagecontent/root.xhtml b/eu.scasefp7.eclipse.core.ui/intropagecontent/root.xhtml
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>root.xhtml</title>
+
+  </head>
+
+<body>
+<h1>Title</h1>
+		<a href="http://s-case.github.io/" id="firstLink">
+			<img border="0" src="../icons/s-case_16x16.png" alt="First link" />
+			<font color="#376b8b" size="3"><b>First item</b></font> 
+		</a>
+
+		<a href="http://s-case.github.io/" id="secondLink">
+			<img border="0" src="../icons/s-case_16x16.png" alt="Second" />
+			<font color="#376b8b" size="3"><b>Second item</b></font>
+	    </a>
+
+</body>
+</html>
diff --git a/eu.scasefp7.eclipse.core.ui/plugin.xml b/eu.scasefp7.eclipse.core.ui/plugin.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension-point id="eu.scasefp7.eclipse.core.ui.dashboardItem" name="Dashboard command" schema="schema/eu.scasefp7.eclipse.core.ui.dashboardItem.exsd"/>
    <extension-point id="eu.scasefp7.eclipse.core.ui.projectWizardPages" name="S-CASE project wizard pages" schema="schema/eu.scasefp7.eclipse.core.ui.projectWizardPages.exsd"/>
 
    <extension
@@ -155,97 +154,7 @@
      </page>
   </extension>
 
-  <!-- Dashboard commands -->
-  <extension
-        point="eu.scasefp7.eclipse.core.ui.dashboardItem">
- <!--    <group
-           name="Project setup">
-        <command
-              commandId="eu.scasefp7.eclipse.core.commands.addRemoveScaseNature"
-              error="Project configuration failed"
-              label="Configure project"
-              notification="Project successfully configured">
-        </command>
-     </group> -->
-     <group
-           name="Design">
-        <command
-              commandId="org.eclipse.ui.newWizard"
-              label="Create requirements"
-              tooltip="Create a new textual requirements collection">
-              <parameter name="newWizardId" value="eu.scasefp7.eclipse.reqeditor.wizards.CreateRqsWizard" />
-        </command>
-        <command
-              commandId="org.eclipse.ui.newWizard"
-              label="Create storyboards"
-              tooltip="Create a new storyboard to describe system behaviour">
-           <parameter
-                 name="newWizardId"
-                 value="eu.scasefp7.eclipse.storyboards.diagram.part.StoryboardsCreationWizardID">
-           </parameter>
-        </command>
-        <command
-              commandId="org.eclipse.ui.newWizard"
-              label="Create mashups"
-              tooltip="Create a new storyboard to describe service composition">
-           <parameter
-                 name="newWizardId"
-                 value="eu.scasefp7.eclipse.storyboards.diagram.part.ServiceCompositionStoryboardsCreationWizardID">
-           </parameter>
-        </command>
-
-        <!--
-        <command
-              commandId="org.eclipse.ui.file.import"
-              label="Import UML Use case diagram"
-              tooltip="Import UML use case diagram from an image">
-              <parameter name="importWizardId" value="eu.scasefp7.eclipse.umlrec.importWizardDISABLE" />
-        </command>
-        -->
-     </group>
-      <group
-           name="Mashup">
- <!--       <command
-              commandId="eu.scasefp7.eclipse.core.commands.compileToOntology"
-              error="Requrements compilation failed."
-              label="Compile"
-              notification="Requirements compiled successfully."
-              tooltip="Compile requirements in text or storyboards">
-        </command>-->
-        <command
-              commandId="eu.scasefp7.eclipse.servicecomposition.importSBD"
-              error="Import storyboard failed."
-              label="Create service composition"
-              tooltip="Use a storyboard for service composition">
-        </command>
-     </group>
-     <group
-           name="Code">
-        <command
-              commandId="eu.scasefp7.eclipse.mde.ui.generateCode"
-              error="Code generation failed."
-              label="Generate code"
-              tooltip="Generate code for the web service">
-        </command>
-        <command
-              commandId="eu.scasefp7.eclipse.mde.ui.generateCode"
-              error="Code generation failed."
-              label="Re-generate code"
-              tooltip="Generate code for the web service using previous settings">
-           <parameter
-                 name="eu.scasefp7.eclipse.mde.ui.generateCode.reload"
-                 value="yes">
-           </parameter>
-        </command>
-     </group>
-     <group
-           name="Run">
-        <command
-              commandId="eu.scasefp7.eclipse.core.ui.commands.openDeployWizard"
-              label="Deploy on YouREST">
-        </command>
-     </group>
-  </extension>
+
 
    <extension
          point="org.eclipse.ui.menus">
@@ -816,4 +725,126 @@
           </propertySection>
        </propertySections>
     </extension>
+    <extension
+         point="org.eclipse.ui.intro">
+      <intro
+            class="org.eclipse.ui.intro.config.CustomizableIntroPart"
+            icon="icons/s-case_16x16.png"
+            id="org.eclipse.intro.minimal"
+            label="Minimal Intro"/>
+      <introProductBinding
+            introId="org.eclipse.intro.minimal"
+            productId="org.eclipse.platform.ide">
+      </introProductBinding>
+   </extension>
+   <extension
+         point="org.eclipse.ui.intro.config">
+      <config
+            content="intropagecontent/introContent.xml"
+            id="org.eclipse.intro.minimal.config"
+            introId="org.eclipse.intro.minimal">
+         <presentation
+               home-page-id="root" standby-page-id="standby">
+            <implementation
+                  kind="html">
+            </implementation>
+         </presentation>
+      </config>
+   </extension>
+   <extension
+         point="eu.scasefp7.eclipse.core.dashboardItem2">
+         <group
+               groupId="eu.scasefp7.eclipse.core.ui.dashboard.groups.design"
+               id="dashboardDesign"
+               name="Design">
+        <command
+              buttonId="eu.scasefp7.eclipse.core.ui.dashboard.buttons.createrqs"
+              commandId="org.eclipse.ui.newWizard"
+              groupName="Design"
+              label="Create requirements"
+              tooltip="Create a new textual requirements collection">
+              <parameter name="newWizardId" value="eu.scasefp7.eclipse.reqeditor.wizards.CreateRqsWizard" />
+        </command>
+        <command
+              buttonId="eu.scasefp7.eclipse.core.ui.dashboard.buttons.createmashups"
+              commandId="org.eclipse.ui.newWizard"
+              groupName="Design"
+              label="Create mashups"
+              tooltip="Create a new storyboard to describe service composition">
+           <parameter
+                 name="newWizardId"
+                 value="eu.scasefp7.eclipse.storyboards.diagram.part.ServiceCompositionStoryboardsCreationWizardID">
+           </parameter>
+        </command>
+
+        <!--
+        <group>
+        <group groupId="" >
+        <command
+              commandId="org.eclipse.ui.file.import"
+              groupId=""
+              label="Import UML Use case diagram"
+              tooltip="Import UML use case diagram from an image">
+              <parameter name="importWizardId" value="eu.scasefp7.eclipse.umlrec.importWizardDISABLE" />
+        </command>
+        -->
+     </group>
+      <group
+            groupId="eu.scasefp7.eclipse.core.ui.dashboard.groups.mashup"
+            id="dashboardMashup"
+            name="Mashup">
+ <!--       <command
+              commandId="eu.scasefp7.eclipse.core.commands.compileToOntology"
+              error="Requrements compilation failed."
+              label="Compile"
+              notification="Requirements compiled successfully."
+              tooltip="Compile requirements in text or storyboards">
+        </command>-->
+        <command
+              buttonId="eu.scasefp7.eclipse.core.ui.dashboard.buttons.createsvccomposition"
+              commandId="eu.scasefp7.eclipse.servicecomposition.importSBD"
+              error="Import storyboard failed."
+              groupName="Mashup"
+              label="Create service composition"
+              tooltip="Use a storyboard for service composition">
+        </command>
+     </group>
+     <group
+           groupId="eu.scasefp7.eclipse.core.ui.dashboard.groups.code"
+           id="dashboardCode"
+           name="Code">
+        <command
+              buttonId="eu.scasefp7.eclipse.core.ui.dashboard.buttons.gencode"
+              commandId="eu.scasefp7.eclipse.mde.ui.generateCode"
+              error="Code generation failed."
+              groupName="Code"
+              label="Generate code"
+              tooltip="Generate code for the web service">
+        </command>
+        <command
+              buttonId="eu.scasefp7.eclipse.core.ui.dashboard.buttons.regencode"
+              commandId="eu.scasefp7.eclipse.mde.ui.generateCode"
+              error="Code generation failed."
+              groupName="Code"
+              label="Re-generate code"
+              tooltip="Generate code for the web service using previous settings">
+           <parameter
+                 name="eu.scasefp7.eclipse.mde.ui.generateCode.reload"
+                 value="yes">
+           </parameter>
+        </command>
+     </group>
+     <group
+           groupId="eu.scasefp7.eclipse.core.ui.dashboard.groups.run"
+           id="dashboardRun"
+           name="Run">
+        <command
+              buttonId="eu.scasefp7.eclipse.core.ui.dashboard.buttons.deploy"
+              commandId="eu.scasefp7.eclipse.core.ui.commands.openDeployWizard"
+              groupId="dashboardRun"
+              groupName="Run"
+              label="Deploy on YouREST">
+        </command>
+     </group>
+   </extension>
 </plugin>
diff --git a/eu.scasefp7.eclipse.core.ui/schema/eu.scasefp7.eclipse.core.ui.projectWizardPages.exsd b/eu.scasefp7.eclipse.core.ui/schema/eu.scasefp7.eclipse.core.ui.projectWizardPages.exsd
@@ -10,7 +10,7 @@
       </documentation>
    </annotation>
 
-   <element name="extension">
+  <element name="extension">
       <annotation>
          <appinfo>
             <meta.element />
@@ -72,7 +72,7 @@
 
                </documentation>
                <appinfo>
-                  <meta.attribute kind="java" basedOn=":eu.scasefp7.eclipse.core.ui.wizards.IProjectWizardPage"/>
+                  <meta.attribute kind="java" basedOn=":eu.scasefp7.eclipse.core.ui.wizards.IScaseWizardPage"/>
                </appinfo>
             </annotation>
          </attribute>