Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell:[916] trunk/templates/org.cishell.templates.wizards
|
From: <pat...@us...> - 2009-08-06 16:27:00
|
Revision: 916
http://cishell.svn.sourceforge.net/cishell/?rev=916&view=rev
Author: pataphil
Date: 2009-08-06 16:26:46 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
* Fixed some bugs.
* STILL NOT REVIEWED.
Modified Paths:
--------------
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pagepanels/SpecifyTemplateStringPanel.java
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/NewStaticExecutableAlgorithmTemplate.java
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/service.properties
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/build.xml
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/gui.xml
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pagepanels/SpecifyTemplateStringPanel.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pagepanels/SpecifyTemplateStringPanel.java 2009-08-06 15:12:31 UTC (rev 915)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pagepanels/SpecifyTemplateStringPanel.java 2009-08-06 16:26:46 UTC (rev 916)
@@ -65,7 +65,7 @@
" (" +
inputParameters[ii].getDescription() +
")";
- String value = "\"${" + inputParameters[ii].getName() + "}\"";
+ String value = "\"${" + inputParameters[ii].getID() + "}\"";
addTableItem(label, value);
}
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/NewStaticExecutableAlgorithmTemplate.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/NewStaticExecutableAlgorithmTemplate.java 2009-08-06 15:12:31 UTC (rev 915)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/NewStaticExecutableAlgorithmTemplate.java 2009-08-06 16:26:46 UTC (rev 916)
@@ -85,6 +85,7 @@
public static final String MENU_PATH_ID = "menuPath";
public static final String MENU_PATH_LABEL = "Menu Path (Optional)";
public static final String DEFAULT_MENU_PATH = "menu_path";
+ public static final String FULL_MENU_PATH = "fullMenuPath";
public static final String MENU_GROUP_ID = "menuGroup";
public static final String MENU_GROUP_LABEL = "Menu Item Placement";
@@ -142,6 +143,9 @@
public static final String IN_DATA_ID = "inData";
public static final String HAS_IN_DATA_ID = "hasInData";
+ public static final String ATTRIBUTE_DEFINITIONS_ID =
+ "attributeDefinitions";
+
public static final String OUT_DATA_ID = "outData";
public static final String HAS_OUT_DATA_ID = "hasOutData";
public static final String OUT_FILES_ID = "outFiles";
@@ -235,9 +239,28 @@
handleEmptyOption(DOCUMENTATION_URL_ID, HAS_DOCUMENTATION_URL_ID, "");
handleEmptyOption(WRITTEN_IN_ID, HAS_WRITTEN_IN_ID, "");
+ String menuPath = (String)getValue(MENU_PATH_ID);
+ if (!menuPath.endsWith("/")) {
+ menuPath += "/";
+ }
+
+ String choice = (String)getOption(MENU_GROUP_ID).getValue();
+
+ for (int ii = 0; ii < GROUP_CHOICES.length; ii++) {
+ if (GROUP_CHOICES[ii][1].equals(choice) ||
+ GROUP_CHOICES[ii][0].equals(choice)) {
+ menuPath += GROUP_CHOICES[ii][0];
+
+ break;
+ }
+
+ }
+
+ setValue(FULL_MENU_PATH, menuPath);
+
// Project Parameters Page
- setValue("attributeDefinitions",
+ setValue(ATTRIBUTE_DEFINITIONS_ID,
this.projectParametersPage.toOutputString());
// In and Out Data Page
Modified: trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/service.properties
===================================================================
--- trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/service.properties 2009-08-06 15:12:31 UTC (rev 915)
+++ trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/service.properties 2009-08-06 16:26:46 UTC (rev 916)
@@ -1,7 +1,7 @@
service.pid=$bundleSymbolicName$
$hasInData$in_data=$inData$
$hasOutData$out_data=$outData$
-$isOnMenu$menu_path=$menuPath$
+$isOnMenu$menu_path=$fullMenuPath$
$hasLabel$label=$label$
$hasDescription$description=$description$
$hasImplementers$implementers=$implementers$
Modified: trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/build.xml
===================================================================
--- trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/build.xml 2009-08-06 15:12:31 UTC (rev 915)
+++ trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/build.xml 2009-08-06 16:26:46 UTC (rev 916)
@@ -1,56 +1,55 @@
-<!-- This file in almost all cases will not need edited -->
-<project name="Static Executable Integration Template" basedir="." default="compile">
- <property file="manifest.properties"/>
-
- <property name="repository.dir" value="${basedir}"/>
- <property name="build.dir" value="${repository.dir}/build"/>
- <property name="lib.dir" value="${repository.dir}/lib"/>
- <property name="out.dir" value="${build.dir}/out"/>
- <property name="global.properties" value="${repository.dir}/manifest.properties"/>
- <property name="gui.file" value="${repository.dir}/gui.xml"/>
- <property name="dest.gui.file" value="${out.dir}/OSGI-INF/metatype/METADATA.XML"/>
- <property name="l10n.dir" value="${repository.dir}/l10n" />
- <property name="dest.l10n.dir" value="${out.dir}/OSGI-INF/l10n"/>
- <property name="template.file" value="${lib.dir}/component.xml"/>
-
- <target name="compile" depends="copy.files"
- description="Compile an OSGi Bundle of the Static Executable">
-
- <createManifest basedir="${out.dir}"
- baseproperties="${global.properties}"
- template="${template.file}"/>
-
- <copy file="${gui.file}" tofile="${dest.gui.file}" failonerror="false"/>
-
- <copy todir="${dest.l10n.dir}">
- <fileset dir="${l10n.dir}"/>
- </copy>
-
- <jar destfile="${build.dir}/${Bundle-SymbolicName}_${Bundle-Version}.jar"
- basedir="${out.dir}" manifest="${out.dir}/META-INF/MANIFEST.MF"/>
- </target>
-
- <target name="copy.files" description="Copying files" depends="tasks.init">
- <copy todir="${out.dir}">
- <fileset dir="${repository.dir}">
- <include name="**/*"/>
- <exclude name="${lib.dir},${build.dir},${l10n.dir}"/>
- <exclude name="l10n/**/*"/>
- <exclude name="build/**/*"/>
- <exclude name="lib/**/*"/>
- <exclude name="src/**/*"/>
- <exclude name="*"/>
- </fileset>
- </copy>
- </target>
-
- <target name="tasks.init" description="Initialize TaskDefinitions">
- <taskdef name="createManifest"
- classname="org.cishell.templates.staticexecutable.StaticExecutableIntegrationTask"
- classpath="${lib.dir}/cishell_templates.jar"/>
- </target>
-
- <target name="clean" description="Clean build directory">
- <delete dir="${build.dir}"/>
- </target>
+<!-- This file in almost all cases will not need edited -->
+<project name="Static Executable Integration Template" basedir="." default="compile">
+ <property file="manifest.properties"/>
+
+ <property name="repository.dir" value="${basedir}"/>
+ <property name="build.dir" value="${repository.dir}/build"/>
+ <property name="lib.dir" value="${repository.dir}/lib"/>
+ <property name="out.dir" value="${build.dir}/out"/>
+ <property name="global.properties" value="${repository.dir}/manifest.properties"/>
+ <property name="gui.file" value="${repository.dir}/gui.xml"/>
+ <property name="dest.gui.file" value="${out.dir}/OSGI-INF/metatype/METADATA.XML"/>
+ <property name="l10n.dir" value="${repository.dir}/l10n" />
+ <property name="dest.l10n.dir" value="${out.dir}/OSGI-INF/l10n"/>
+ <property name="template.file" value="${lib.dir}/component.xml"/>
+
+ <target name="compile" depends="copy.files"
+ description="Compile an OSGi Bundle of the Static Executable">
+
+ <createManifest basedir="${out.dir}"
+ baseproperties="${global.properties}"
+ template="${template.file}"/>
+
+ <copy file="${gui.file}" tofile="${dest.gui.file}" failonerror="false"/>
+
+ <copy todir="${dest.l10n.dir}">
+ <fileset dir="${l10n.dir}"/>
+ </copy>
+
+ <jar destfile="${build.dir}/${Bundle-SymbolicName}_${Bundle-Version}.jar"
+ basedir="${out.dir}" manifest="${out.dir}/META-INF/MANIFEST.MF"/>
+ </target>
+
+ <target name="copy.files" description="Copying files" depends="tasks.init">
+ <copy todir="${out.dir}">
+ <fileset dir="${repository.dir}">
+ <include name="**/*"/>
+ <exclude name="${lib.dir},${build.dir},${l10n.dir}"/>
+ <exclude name="l10n/**/*"/>
+ <exclude name="build/**/*"/>
+ <exclude name="lib/**/*"/>
+ <exclude name="*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="tasks.init" description="Initialize TaskDefinitions">
+ <taskdef name="createManifest"
+ classname="org.cishell.templates.staticexecutable.StaticExecutableIntegrationTask"
+ classpath="${lib.dir}/cishell_templates.jar"/>
+ </target>
+
+ <target name="clean" description="Clean build directory">
+ <delete dir="${build.dir}"/>
+ </target>
</project>
\ No newline at end of file
Modified: trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/gui.xml
===================================================================
--- trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/gui.xml 2009-08-06 15:12:31 UTC (rev 915)
+++ trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/gui.xml 2009-08-06 16:26:46 UTC (rev 916)
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0">
-<!-- SAMPLE
- <OCD name="$bundleName$" id="$bundleSymbolicName$.OCD"
+ <OCD name="$bundleName$" id="$bundleSymbolicName$.gui"
description="$description$">
$attributeDefinitions$
</OCD>
<Designate pid="$bundleSymbolicName$">
<Object ocdref="$bundleSymbolicName$.gui" />
</Designate>
- -->
</metatype:MetaData>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
