From: <bh...@us...> - 2008-03-25 15:34:47
|
Revision: 697 http://cishell.svn.sourceforge.net/cishell/?rev=697&view=rev Author: bh2 Date: 2008-03-25 08:33:54 -0700 (Tue, 25 Mar 2008) Log Message: ----------- did simple updates to menumanager, but still needs to deal w/ parameters, better exception handling, and in/out data extension Modified Paths: -------------- trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF =================================================================== --- trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF 2008-03-25 15:25:26 UTC (rev 696) +++ trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF 2008-03-25 15:33:54 UTC (rev 697) @@ -2,19 +2,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: Menu Manager Plug-in Bundle-SymbolicName: org.cishell.reference.gui.menumanager;singleton:=true -Bundle-Version: 0.6.0 +Bundle-Version: 1.0.0 Bundle-Activator: org.cishell.reference.gui.menumanager.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Eclipse-LazyStart: true -Import-Package: org.cishell.app.service.datamanager, - org.cishell.app.service.scheduler, - org.cishell.framework, - org.cishell.framework.algorithm, - org.cishell.framework.data, +Import-Package: org.cishell.app.service.datamanager;version="1.0.0", + org.cishell.app.service.scheduler;version="1.0.0", + org.cishell.framework;version="1.0.0", + org.cishell.framework.algorithm;version="1.0.0", + org.cishell.framework.data;version="1.0.0", org.cishell.reference.gui.workspace, - org.cishell.service.conversion, - org.cishell.service.guibuilder, + org.cishell.service.conversion;version="1.0.0", + org.cishell.service.guibuilder;version="1.0.0", org.osgi.service.log;version="1.3.0", org.osgi.service.metatype;version="1.1.0" Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java =================================================================== --- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2008-03-25 15:25:26 UTC (rev 696) +++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2008-03-25 15:33:54 UTC (rev 697) @@ -29,11 +29,6 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; public class AlgorithmAction extends Action implements AlgorithmProperty, DataManagerListener { @@ -113,7 +108,7 @@ //adjust to log the whole acknowledgement in one block LogService logger = (LogService) ciContext.getService(LogService.class.getName()); StringBuffer acknowledgement = new StringBuffer(); - String label = (String)ref.getProperty("label"); + String label = (String)ref.getProperty(LABEL); if (label != null){ acknowledgement.append("..........\n"+ label+" was selected.\n"); @@ -121,22 +116,22 @@ String authors = (String)ref.getProperty("authors"); if (authors != null) acknowledgement.append("Author(s): "+authors+"\n"); - String implementers = (String)ref.getProperty("implementers"); + String implementers = (String)ref.getProperty(IMPLEMENTERS); if (implementers != null) acknowledgement.append("Implementer(s): "+implementers+"\n"); - String integrators = (String)ref.getProperty("integrators"); + String integrators = (String)ref.getProperty(INTEGRATORS); if (integrators != null) acknowledgement.append("Integrator(s): "+integrators+"\n"); - String reference = (String)ref.getProperty("reference"); - String reference_url = (String)ref.getProperty("reference_url"); + String reference = (String)ref.getProperty(REFERENCE); + String reference_url = (String)ref.getProperty(REFERENCE_URL); if (reference != null && reference_url != null ) acknowledgement.append("Reference: "+reference+ " ("+reference_url+")\n"); else if (reference != null && reference_url == null ) acknowledgement.append("Reference: "+reference+"\n"); - String docu = (String)ref.getProperty("docu"); + String docu = (String)ref.getProperty(DOCUMENTATION_URL); if (docu != null) - acknowledgement.append("Docu: "+docu+"\n"); + acknowledgement.append("Documentation: "+docu+"\n"); if(acknowledgement.length()>1) logger.log(LogService.LOG_INFO, acknowledgement.toString()); Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java =================================================================== --- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2008-03-25 15:25:26 UTC (rev 696) +++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2008-03-25 15:33:54 UTC (rev 697) @@ -110,7 +110,9 @@ } } - this.provider = factory.createParameters(data); + //FIXME: + //this.provider = factory.createParameters(data); + this.provider = null; String pid = (String)ref.getProperty(Constants.SERVICE_PID); this.parameters = new Hashtable(); @@ -218,12 +220,12 @@ && originalData.length == data.length) { for (int i=0; i < outData.length; i++) { if (outData[i] != null) { - Object parent = outData[i].getMetaData().get(DataProperty.PARENT); + Object parent = outData[i].getMetadata().get(DataProperty.PARENT); if (parent != null) { for (int j=0; j < data.length; i++) { if (parent == data[j]) { - outData[i].getMetaData().put(DataProperty.PARENT, + outData[i].getMetadata().put(DataProperty.PARENT, originalData[j]); break; } @@ -243,8 +245,8 @@ for (int i=0; i < outData.length; i++) { //if they don't have a parent set already then we set one if (outData[i] != null && - outData[i].getMetaData().get(DataProperty.PARENT) == null) { - outData[i].getMetaData().put(DataProperty.PARENT, originalData[0]); + outData[i].getMetadata().get(DataProperty.PARENT) == null) { + outData[i].getMetadata().put(DataProperty.PARENT, originalData[0]); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |