Menu
▾
▴
cishell-svn — Mailing list for commit messages to CIShell
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(7) |
Aug
|
Sep
(46) |
Oct
(102) |
Nov
(10) |
Dec
(21) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(3) |
Mar
(14) |
Apr
(9) |
May
(12) |
Jun
(4) |
Jul
(40) |
Aug
(60) |
Sep
(38) |
Oct
(2) |
Nov
(1) |
Dec
(42) |
| 2008 |
Jan
(23) |
Feb
(29) |
Mar
(107) |
Apr
(27) |
May
(3) |
Jun
(1) |
Jul
(15) |
Aug
(7) |
Sep
(19) |
Oct
|
Nov
(2) |
Dec
|
| 2009 |
Jan
(36) |
Feb
(4) |
Mar
(2) |
Apr
(1) |
May
(1) |
Jun
(15) |
Jul
(30) |
Aug
(32) |
Sep
(11) |
Oct
(21) |
Nov
(12) |
Dec
(15) |
| 2010 |
Jan
(29) |
Feb
(9) |
Mar
(25) |
Apr
|
May
(7) |
Jun
(5) |
Jul
(21) |
Aug
(32) |
Sep
(10) |
Oct
(8) |
Nov
(29) |
Dec
(8) |
| 2011 |
Jan
(9) |
Feb
(35) |
Mar
(11) |
Apr
(4) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(3) |
Dec
(30) |
| 2012 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <pat...@us...> - 2009-01-05 17:56:03
|
Revision: 828
http://cishell.svn.sourceforge.net/cishell/?rev=828&view=rev
Author: pataphil
Date: 2009-01-05 17:55:56 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
Log writing code now outputs exception stack traces when the exception objects are provided.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogToFile.java
Modified: trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogToFile.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogToFile.java 2009-01-05 17:54:22 UTC (rev 827)
+++ trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogToFile.java 2009-01-05 17:55:56 UTC (rev 828)
@@ -1,17 +1,18 @@
package org.cishell.reference.gui.log;
import java.io.File;
-
-import org.osgi.service.log.LogEntry;
-import org.osgi.service.log.LogListener;
-
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.Calendar;
import java.util.logging.FileHandler;
+import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.logging.Level;
import java.util.logging.SimpleFormatter;
-import java.io.IOException;
+import org.osgi.service.log.LogEntry;
+import org.osgi.service.log.LogListener;
+
/**
* This is a basic implementation. It writes log records to files
* @author Weixia(Bonnie) Huang (hu...@in...)
@@ -89,9 +90,22 @@
javaLogLevel = Level.INFO;
} // edited by Felix Terkhorn. ter...@gm... May-9-2007
- if (goodMessage(message)){
- logger.log(javaLogLevel, message+"\n"); // stdout printing happens here, despite having 1 handler only
+ // Log the exception?
+ Throwable throwableToBeLogged = entry.getException();
+
+ // Log the exception's stack trace?
+ if (throwableToBeLogged != null) {
+ // TODO: Log to a different file? This would possibly be where we'd
+ // check the preferences/etc.
+ StringWriter stackTraceStringWriter = new StringWriter();
+
+ throwableToBeLogged.printStackTrace(new PrintWriter(stackTraceStringWriter));
+ logger.log(javaLogLevel, "Stace Trace: " + stackTraceStringWriter.toString() + "\r\n");
}
+
+ if (goodMessage(message)) {
+ logger.log(javaLogLevel, message + "\r\n"); // stdout printing happens here, despite having 1 handler only
+ }
}
private boolean goodMessage(String msg) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-01-05 17:54:26
|
Revision: 827
http://cishell.svn.sourceforge.net/cishell/?rev=827&view=rev
Author: pataphil
Date: 2009-01-05 17:54:22 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
Modified to actually log exceptions where appropriate.
Modified Paths:
--------------
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/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 2009-01-02 17:59:21 UTC (rev 826)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2009-01-05 17:54:22 UTC (rev 827)
@@ -176,7 +176,7 @@
outData = algorithm.execute();
} catch (AlgorithmExecutionException e) {
log(LogService.LOG_ERROR, "The Algorithm: \"" + ref.getProperty(AlgorithmProperty.LABEL)
- + "\" had an error while executing: " + e.getMessage());
+ + "\" had an error while executing: " + e.getMessage(), e);
} catch (RuntimeException e) {
GUIBuilderService builder = (GUIBuilderService) ciContext.getService(GUIBuilderService.class.getName());
@@ -258,7 +258,7 @@
provider = new BasicMetaTypeProvider(ocd);
}
} catch (IllegalArgumentException e) {
- log(LogService.LOG_DEBUG, pid + " has an invalid metatype id: " + metatypePID);
+ log(LogService.LOG_DEBUG, pid + " has an invalid metatype id: " + metatypePID, e);
} catch (Exception e) {
GUIBuilderService builder = (GUIBuilderService) ciContext.getService(GUIBuilderService.class.getName());
String errorMessage = "An error occurred while preparing to run the algorithm "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2009-01-02 17:59:32
|
Revision: 826
http://cishell.svn.sourceforge.net/cishell/?rev=826&view=rev
Author: mwlinnem
Date: 2009-01-02 17:59:21 +0000 (Fri, 02 Jan 2009)
Log Message:
-----------
Other plugins can now import and use the DatabaseFactory interface (and its associated Exception).
Modified Paths:
--------------
trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF
Modified: trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF 2009-01-02 17:57:02 UTC (rev 825)
+++ trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF 2009-01-02 17:59:21 UTC (rev 826)
@@ -9,4 +9,5 @@
org.osgi.service.metatype,
org.osgi.service.prefs
Export-Package:
+ org.cishell.service.database.databasefactory
Bundle-ActivationPolicy: lazy
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2009-01-02 17:57:36
|
Revision: 825
http://cishell.svn.sourceforge.net/cishell/?rev=825&view=rev
Author: mwlinnem
Date: 2009-01-02 17:57:02 +0000 (Fri, 02 Jan 2009)
Log Message:
-----------
Initial commit.
Added Paths:
-----------
trunk/core/org.cishell.service.database/.classpath
trunk/core/org.cishell.service.database/.project
trunk/core/org.cishell.service.database/.settings/
trunk/core/org.cishell.service.database/META-INF/
trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF
trunk/core/org.cishell.service.database/build.properties
trunk/core/org.cishell.service.database/javadoc.xml
trunk/core/org.cishell.service.database/lib/
trunk/core/org.cishell.service.database/lib/osgi.compendium.jar
trunk/core/org.cishell.service.database/lib/osgi.core.jar
trunk/core/org.cishell.service.database/src/
trunk/core/org.cishell.service.database/src/org/
trunk/core/org.cishell.service.database/src/org/cishell/
trunk/core/org.cishell.service.database/src/org/cishell/service/
trunk/core/org.cishell.service.database/src/org/cishell/service/database/
trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/
trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseCreationException.java
trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseFactory.java
Added: trunk/core/org.cishell.service.database/.classpath
===================================================================
--- trunk/core/org.cishell.service.database/.classpath (rev 0)
+++ trunk/core/org.cishell.service.database/.classpath 2009-01-02 17:57:02 UTC (rev 825)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/core/org.cishell.service.database/.project
===================================================================
--- trunk/core/org.cishell.service.database/.project (rev 0)
+++ trunk/core/org.cishell.service.database/.project 2009-01-02 17:57:02 UTC (rev 825)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.cishell.service.database</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF (rev 0)
+++ trunk/core/org.cishell.service.database/META-INF/MANIFEST.MF 2009-01-02 17:57:02 UTC (rev 825)
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: CIShell Platform API
+Bundle-SymbolicName: org.cishell.framework
+Bundle-Version: 1.0.0
+Bundle-Vendor: Cyberinfrastructure for Network Science Center
+Import-Package: org.osgi.framework,
+ org.osgi.service.log,
+ org.osgi.service.metatype,
+ org.osgi.service.prefs
+Export-Package:
+Bundle-ActivationPolicy: lazy
Added: trunk/core/org.cishell.service.database/build.properties
===================================================================
--- trunk/core/org.cishell.service.database/build.properties (rev 0)
+++ trunk/core/org.cishell.service.database/build.properties 2009-01-02 17:57:02 UTC (rev 825)
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ bin/
Added: trunk/core/org.cishell.service.database/javadoc.xml
===================================================================
--- trunk/core/org.cishell.service.database/javadoc.xml (rev 0)
+++ trunk/core/org.cishell.service.database/javadoc.xml 2009-01-02 17:57:02 UTC (rev 825)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="javadoc">
+ <property name="version" value="1.0" />
+ <target name="javadoc">
+ <javadoc destdir="bin/doc"
+ access="public"
+ source="1.4"
+ use="true"
+ notree="false"
+ nonavbar="false"
+ noindex="false"
+ splitindex="true"
+ author="true"
+ version="true"
+ nodeprecatedlist="false"
+ nodeprecated="false"
+ packagenames="org.cishell.framework.data,org.cishell.framework.userprefs,org.cishell.service.guibuilder,org.cishell.app.service.scheduler,org.cishell.framework,org.cishell.app.service.datamanager,org.cishell.framework.algorithm,org.cishell.service.conversion"
+ sourcepath="src"
+ classpath="lib/osgi.core.jar:lib/osgi.compendium.jar"
+ overview="src/org/cishell/overview.html"
+ doctitle="CIShell: Cyberinfrastructure Shell v${version} API">
+ <link href="http://bundles.osgi.org/javadoc/r4/"/>
+ <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
+ </javadoc>
+ </target>
+</project>
Added: trunk/core/org.cishell.service.database/lib/osgi.compendium.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/org.cishell.service.database/lib/osgi.compendium.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/core/org.cishell.service.database/lib/osgi.core.jar
===================================================================
(Binary files differ)
Property changes on: trunk/core/org.cishell.service.database/lib/osgi.core.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseCreationException.java
===================================================================
--- trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseCreationException.java (rev 0)
+++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseCreationException.java 2009-01-02 17:57:02 UTC (rev 825)
@@ -0,0 +1,25 @@
+package org.cishell.service.database.databasefactory;
+
+public class DatabaseCreationException extends Exception {
+
+ private static final long serialVersionUID = 1L;
+
+ //Constructors from Exception superclass
+
+ public DatabaseCreationException() {
+ super();
+ }
+
+ public DatabaseCreationException(String arg0) {
+ super(arg0);
+ }
+
+ public DatabaseCreationException(Throwable arg0) {
+ super(arg0);
+ }
+
+ public DatabaseCreationException(String arg0, Throwable arg1) {
+ super(arg0, arg1);
+ }
+
+}
Added: trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseFactory.java
===================================================================
--- trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseFactory.java (rev 0)
+++ trunk/core/org.cishell.service.database/src/org/cishell/service/database/databasefactory/DatabaseFactory.java 2009-01-02 17:57:02 UTC (rev 825)
@@ -0,0 +1,8 @@
+package org.cishell.service.database.databasefactory;
+
+import javax.sql.DataSource;
+
+public interface DatabaseFactory {
+
+ public DataSource createDatabase() throws DatabaseCreationException;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2009-01-02 17:56:26
|
Revision: 824
http://cishell.svn.sourceforge.net/cishell/?rev=824&view=rev
Author: mwlinnem
Date: 2009-01-02 17:56:18 +0000 (Fri, 02 Jan 2009)
Log Message:
-----------
Initial import.
Added Paths:
-----------
trunk/core/org.cishell.service.database/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2008-11-07 16:45:06
|
Revision: 823
http://cishell.svn.sourceforge.net/cishell/?rev=823&view=rev
Author: mwlinnem
Date: 2008-11-07 16:44:56 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
Small change.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java
Modified: trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java 2008-11-06 17:16:18 UTC (rev 822)
+++ trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java 2008-11-07 16:44:56 UTC (rev 823)
@@ -44,7 +44,7 @@
}
public boolean getBoolean(String name) {
- return Boolean.parseBoolean((String) this.prefDict.get(name));
+ return (Boolean.valueOf((String) this.prefDict.get(name))).booleanValue();
}
public boolean getDefaultBoolean(String name) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2008-11-06 17:16:27
|
Revision: 822
http://cishell.svn.sourceforge.net/cishell/?rev=822&view=rev
Author: mwlinnem
Date: 2008-11-06 17:16:18 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
Now convert wraps uncaught exceptions as conversion exceptions (should prevent conversion from dying silently as it has in the past)
Modified Paths:
--------------
trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java
Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java 2008-09-24 20:15:05 UTC (rev 821)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java 2008-11-06 17:16:18 UTC (rev 822)
@@ -74,7 +74,9 @@
try {
dm = alg.execute();
} catch (AlgorithmExecutionException e1) {
- throw new ConversionException(e1);
+ throw new ConversionException("Exception occurred while converting data \r\n" + e1.getMessage(),e1);
+ } catch (Exception e2) {
+ throw new ConversionException("Exception occurred while converting data \r\n" + e2.getMessage(), e2);
}
Object outData = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2008-09-24 20:15:09
|
Revision: 821
http://cishell.svn.sourceforge.net/cishell/?rev=821&view=rev
Author: mwlinnem
Date: 2008-09-24 20:15:05 +0000 (Wed, 24 Sep 2008)
Log Message:
-----------
Added content to v1.0.0beta tag.
Added Paths:
-----------
tags/v1.0.0beta/clients/
tags/v1.0.0beta/core/
tags/v1.0.0beta/deployment/
tags/v1.0.0beta/examples/
tags/v1.0.0beta/libs/
tags/v1.0.0beta/templates/
tags/v1.0.0beta/testing/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2008-09-24 20:11:30
|
Revision: 820
http://cishell.svn.sourceforge.net/cishell/?rev=820&view=rev
Author: mwlinnem
Date: 2008-09-24 20:11:27 +0000 (Wed, 24 Sep 2008)
Log Message:
-----------
Adding folder for v1.0.0beta tag.
Added Paths:
-----------
tags/v1.0.0beta/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2008-09-24 16:47:52
|
Revision: 819
http://cishell.svn.sourceforge.net/cishell/?rev=819&view=rev
Author: fugu13
Date: 2008-09-24 16:47:38 +0000 (Wed, 24 Sep 2008)
Log Message:
-----------
Added maximally tentative checks for null in area that was throwing null pointer exceptions.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.scheduler/src/org/cishell/reference/gui/scheduler/Activator.java
Modified: trunk/clients/gui/org.cishell.reference.gui.scheduler/src/org/cishell/reference/gui/scheduler/Activator.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.scheduler/src/org/cishell/reference/gui/scheduler/Activator.java 2008-09-23 21:11:14 UTC (rev 818)
+++ trunk/clients/gui/org.cishell.reference.gui.scheduler/src/org/cishell/reference/gui/scheduler/Activator.java 2008-09-24 16:47:38 UTC (rev 819)
@@ -82,9 +82,13 @@
if (context != null) {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
+ /*
+ *
+ */
Action scheduler = new SchedulerAction();
IMenuManager manager = CIShellApplication.getMenuManager();
+
IMenuManager newManager = null;
for (int i = 0; i < ATTEMPTS_TO_FIND_TOOLBAR && newManager == null; i++) {
try {
@@ -99,16 +103,21 @@
if (manager == null) {
System.err.println( "Unable to add Scheduler to Tools menu, since Tools menu does not exist.");
+ } else {
+ manager.appendToGroup("start", scheduler);
}
-
- manager.appendToGroup("start", scheduler);
SchedulerView view = SchedulerView.getDefault();
boolean visible = view != null
&& PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage()
.isPartVisible(view);
scheduler.setChecked(visible);
- CIShellApplication.getMenuManager().update(true);
+ IMenuManager otherManagerReference = CIShellApplication.getMenuManager();
+ if(otherManagerReference == null) {
+ System.err.println("The menu manager is still null. Surprise.");
+ } else {
+ otherManagerReference.update(true);
+ }
}
});
waitForBundleContext = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 818
http://cishell.svn.sourceforge.net/cishell/?rev=818&view=rev
Author: mwlinnem
Date: 2008-09-23 21:11:14 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
Adding hackish fix for directory heirarchy reader. Better than nothing.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/metatypewrapper/ParamAD.java
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/metatypewrapper/ParamAD.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/metatypewrapper/ParamAD.java 2008-09-23 19:55:21 UTC (rev 817)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/metatypewrapper/ParamAD.java 2008-09-23 21:11:14 UTC (rev 818)
@@ -64,11 +64,16 @@
if (defaultValues == null) return new String[0];
String[] replacedValues = new String[defaultValues.length];
for (int i = 0; i < defaultValues.length; i++) {
+
if (defaultValues[i] != null && defaultValues[i].contains(":") && overrideValues[i] != null && overrideValues[i].equals("")) {
replacedValues[i] = defaultValues[i].substring(0, defaultValues[i].indexOf(":") + 1);
} else {
replacedValues[i] = overrideValues[i];
}
+ if (defaultValues[i].contains(":") && overrideValues[i] != null && ! overrideValues[i].equals("") && ! overrideValues[i].contains(":")) {
+ String prefix = defaultValues[i].substring(0, defaultValues[i].indexOf(":") + 1);
+ replacedValues[i] = prefix + overrideValues[i];
+ }
}
return replacedValues;
} catch (Exception e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 817
http://cishell.svn.sourceforge.net/cishell/?rev=817&view=rev
Author: mwlinnem
Date: 2008-09-23 19:55:21 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
Oops. Didn't work. Reverting.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java 2008-09-23 19:37:43 UTC (rev 816)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java 2008-09-23 19:55:21 UTC (rev 817)
@@ -110,12 +110,6 @@
}
else {
value = currentValue;
-
- if (value instanceof String) {
- String stringValue = (String) value;
- stringValue.replace("file:", "");
- stringValue.replace("directory:", "");
- }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 816
http://cishell.svn.sourceforge.net/cishell/?rev=816&view=rev
Author: mwlinnem
Date: 2008-09-23 19:37:43 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
A hack to make directories show up correctly. Will have to revisit this area later when refactoring.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java 2008-09-23 17:50:15 UTC (rev 815)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java 2008-09-23 19:37:43 UTC (rev 816)
@@ -108,8 +108,15 @@
value = new File(System.getProperty("osgi.install.area").replace("file:","")).getAbsolutePath();
currentValue = value;
}
- else
- value = currentValue;
+ else {
+ value = currentValue;
+
+ if (value instanceof String) {
+ String stringValue = (String) value;
+ stringValue.replace("file:", "");
+ stringValue.replace("directory:", "");
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-09-23 17:51:22
|
Revision: 815
http://cishell.svn.sourceforge.net/cishell/?rev=815&view=rev
Author: huangb
Date: 2008-09-23 17:50:15 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
Map both MATRIX_TYPE and TABLE_TYPE to tableIcon. See annotation inside the code
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2008-09-23 17:38:09 UTC (rev 814)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2008-09-23 17:50:15 UTC (rev 815)
@@ -69,7 +69,15 @@
typeToImageMapping = new HashMap();
registerImage(DataProperty.OTHER_TYPE, unknownIcon);
- registerImage(DataProperty.MATRIX_TYPE, matrixIcon);
+
+ /********************************************
+ * This is a temporary work around solution.
+ * Since many algs claims the output data type is MATRIX_TYPE,
+ * but in fact it should be TABLE_TYPE.
+ * Should associate MATRIX_TYPE with matrixIcon and clean up
+ * related algs.
+ * ******************************************/
+ registerImage(DataProperty.MATRIX_TYPE, tableIcon);
registerImage(DataProperty.NETWORK_TYPE, networkIcon);
registerImage(DataProperty.TREE_TYPE, treeIcon);
registerImage(DataProperty.TEXT_TYPE, textIcon);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2008-09-23 17:38:28
|
Revision: 814
http://cishell.svn.sourceforge.net/cishell/?rev=814&view=rev
Author: mwlinnem
Date: 2008-09-23 17:38:09 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
Oops. Did that wrong. Undoing changes.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java
Modified: trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java 2008-09-23 17:34:39 UTC (rev 813)
+++ trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java 2008-09-23 17:38:09 UTC (rev 814)
@@ -88,12 +88,7 @@
}
public String getString(String name) {
- PreferenceAD attributeCorrespondingToThisName = this.prefOCD.getAttributeByID(name);
- String attributePrefix = attributeCorrespondingToThisName.getPreferenceTypePrefix();
String result = (String) this.prefDict.get(name);
- if (result != null) {
- result = attributePrefix + result;
- }
return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2008-09-23 17:34:55
|
Revision: 813
http://cishell.svn.sourceforge.net/cishell/?rev=813&view=rev
Author: mwlinnem
Date: 2008-09-23 17:34:39 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
Changed preference GUI so it wouldn't remove type prefixes from values if a user changes a parameter value from its default.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java
Modified: trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java 2008-09-23 17:30:40 UTC (rev 812)
+++ trunk/clients/gui/org.cishell.reference.gui.prefs.swt/src/org/cishell/reference/gui/prefs/swt/CIShellPreferenceStore.java 2008-09-23 17:34:39 UTC (rev 813)
@@ -87,8 +87,13 @@
return Long.parseLong(((String) this.prefDict.get(name)));
}
- public String getString(String name) {
+ public String getString(String name) {
+ PreferenceAD attributeCorrespondingToThisName = this.prefOCD.getAttributeByID(name);
+ String attributePrefix = attributeCorrespondingToThisName.getPreferenceTypePrefix();
String result = (String) this.prefDict.get(name);
+ if (result != null) {
+ result = attributePrefix + result;
+ }
return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2008-09-23 17:30:55
|
Revision: 812
http://cishell.svn.sourceforge.net/cishell/?rev=812&view=rev
Author: mwlinnem
Date: 2008-09-23 17:30:40 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
Extended Preference AD and OCD interfaces to facilitate type prefix lookup.
Modified Paths:
--------------
trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/PreferenceAD.java
trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/PreferenceOCD.java
trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PreferenceADImpl.java
trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PreferenceOCDImpl.java
trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/TypePrefixes.java
Modified: trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/PreferenceAD.java
===================================================================
--- trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/PreferenceAD.java 2008-09-22 20:31:59 UTC (rev 811)
+++ trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/PreferenceAD.java 2008-09-23 17:30:40 UTC (rev 812)
@@ -29,6 +29,8 @@
public abstract int getType();
public abstract int getPreferenceType();
+
+ public abstract String getPreferenceTypePrefix();
public abstract String validate(String value);
Modified: trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/PreferenceOCD.java
===================================================================
--- trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/PreferenceOCD.java 2008-09-22 20:31:59 UTC (rev 811)
+++ trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/PreferenceOCD.java 2008-09-23 17:30:40 UTC (rev 812)
@@ -14,6 +14,8 @@
//use to get at the special preference attribute goodness.
public abstract PreferenceAD[] getPreferenceAttributeDefinitions(
int filter);
+
+ public abstract PreferenceAD getAttributeByID(String attributeID);
public abstract String getDescription();
Modified: trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PreferenceADImpl.java
===================================================================
--- trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PreferenceADImpl.java 2008-09-22 20:31:59 UTC (rev 811)
+++ trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PreferenceADImpl.java 2008-09-23 17:30:40 UTC (rev 812)
@@ -34,7 +34,7 @@
private int inferPreferenceType(AttributeDefinition realAD) {
int preferenceType;
- if (realAD.getType() == AttributeDefinition.STRING) {
+ if (realAD.getType() != PreferenceAD.TEXT) {
String defaultVal = realAD.getDefaultValue()[0];
if (defaultVal.startsWith(TypePrefixes.DIRECTORY_PREFIX)) {
@@ -194,6 +194,10 @@
public int getPreferenceType() {
return this.preferenceType;
}
+
+ public String getPreferenceTypePrefix() {
+ return TypePrefixes.getPrefPrefixFromPrefTypeID(new Integer(this.getPreferenceType()));
+ }
/* (non-Javadoc)
* @see org.cishell.service.prefadmin.shouldbeelsewhere.PreferenceAttributeDefinition#validate(java.lang.String)
@@ -201,5 +205,4 @@
public String validate(String value) {
return this.realAD.validate(value);
}
-
}
Modified: trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PreferenceOCDImpl.java
===================================================================
--- trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PreferenceOCDImpl.java 2008-09-22 20:31:59 UTC (rev 811)
+++ trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/PreferenceOCDImpl.java 2008-09-23 17:30:40 UTC (rev 812)
@@ -90,4 +90,23 @@
return this.realOCD.getName();
}
+ public PreferenceAD getAttributeByID(String attributeID) {
+ PreferenceAD adWeAreLookingFor = null;
+
+ PreferenceAD[] ads = this.getPreferenceAttributeDefinitions(ObjectClassDefinition.ALL);
+ for (int ii = 0; ii < ads.length; ii++) {
+ PreferenceAD ad = ads[ii];
+
+ if (ad.getID().equals(attributeID)) {
+ adWeAreLookingFor = ad;
+ break;
+ }
+ }
+
+ if (adWeAreLookingFor != null) {
+ return adWeAreLookingFor;
+ } else {
+ return null;
+ }
+ }
}
Modified: trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/TypePrefixes.java
===================================================================
--- trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/TypePrefixes.java 2008-09-22 20:31:59 UTC (rev 811)
+++ trunk/core/org.cishell.reference.prefs.admin/src/org/cishell/reference/prefs/admin/internal/TypePrefixes.java 2008-09-23 17:30:40 UTC (rev 812)
@@ -1,5 +1,9 @@
package org.cishell.reference.prefs.admin.internal;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.cishell.reference.prefs.admin.PreferenceAD;
import org.osgi.service.metatype.AttributeDefinition;
public class TypePrefixes {
@@ -10,8 +14,49 @@
public static final String PATH_PREFIX = "path:";
public static final String COLOR_PREFIX = "color:";
+ private static Map prefixToTypeID = new HashMap();
+ static {
+ prefixToTypeID.put(FONT_PREFIX, new Integer(PreferenceAD.FONT));
+ prefixToTypeID.put(DIRECTORY_PREFIX, new Integer(PreferenceAD.DIRECTORY));
+ prefixToTypeID.put(FILE_PREFIX, new Integer(PreferenceAD.FILE));
+ prefixToTypeID.put(PATH_PREFIX, new Integer(PreferenceAD.PATH));
+ prefixToTypeID.put(COLOR_PREFIX, new Integer(PreferenceAD.COLOR));
+ }
+
+ private static Map typeIDToPrefix = new HashMap();
+ static {
+ typeIDToPrefix.put(new Integer(PreferenceAD.FONT), FONT_PREFIX);
+ typeIDToPrefix.put(new Integer(PreferenceAD.DIRECTORY), DIRECTORY_PREFIX);
+ typeIDToPrefix.put(new Integer(PreferenceAD.FILE), FILE_PREFIX);
+ typeIDToPrefix.put(new Integer(PreferenceAD.PATH), PATH_PREFIX);
+ typeIDToPrefix.put(new Integer(PreferenceAD.COLOR), COLOR_PREFIX);
+ typeIDToPrefix.put(new Integer(PreferenceAD.CHOICE), "");
+ typeIDToPrefix.put(new Integer(PreferenceAD.PATH), "");
+ typeIDToPrefix.put(new Integer(PreferenceAD.TEXT), "");
+ }
public static boolean hasPrefix(AttributeDefinition prefAD, String prefix) {
return prefAD.getDefaultValue()[0].startsWith(prefix);
}
+
+ //Will return "" for unrecognized prefixes
+ public static String getPrefPrefixFromPrefTypeID(Integer typeID) {
+ String prefix = (String) typeIDToPrefix.get(typeID);
+ if (prefix != null) {
+ return prefix;
+ } else {
+ return "";
+ }
+ }
+
+ //Will return -1 for unrecognized type IDs.
+ public static Integer getPrefTypeIDFromPrefix(String prefix) {
+ Integer typeID = (Integer) prefixToTypeID.get(prefix);
+ if (typeID != null) {
+ return typeID;
+ } else {
+ System.err.println("Warning: unable to return valid type ID for prefix '" + prefix + "' in TypePrefix.prefPrefixToPrefTypeID");
+ return new Integer(-1);
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-09-22 20:32:18
|
Revision: 811
http://cishell.svn.sourceforge.net/cishell/?rev=811&view=rev
Author: huangb
Date: 2008-09-22 20:31:59 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
Separate matrix data type from table data type.
Have a separate matrix icon from table icon
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2008-09-18 21:20:17 UTC (rev 810)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2008-09-22 20:31:59 UTC (rev 811)
@@ -38,6 +38,7 @@
private Image unknownIcon;
private Image textIcon;
private Image plotIcon;
+ private Image tableIcon;
private Map typeToImageMapping;
@@ -58,12 +59,13 @@
children = new ArrayList();
this.brandPluginID = brandPluginID;
- matrixIcon = createImage("table.png", this.brandPluginID);
+ matrixIcon = createImage("matrix.png", this.brandPluginID);
treeIcon = createImage("tree.png", this.brandPluginID);
networkIcon = createImage("network.png", this.brandPluginID);
unknownIcon = createImage("unknown.png", this.brandPluginID);
textIcon = createImage("text.png", this.brandPluginID);
plotIcon = createImage("plot.png", this.brandPluginID);
+ tableIcon = createImage("table.png", this.brandPluginID);
typeToImageMapping = new HashMap();
registerImage(DataProperty.OTHER_TYPE, unknownIcon);
@@ -72,7 +74,7 @@
registerImage(DataProperty.TREE_TYPE, treeIcon);
registerImage(DataProperty.TEXT_TYPE, textIcon);
registerImage(DataProperty.PLOT_TYPE, plotIcon);
- registerImage(DataProperty.TABLE_TYPE, matrixIcon);
+ registerImage(DataProperty.TABLE_TYPE, tableIcon);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-09-18 14:20:22
|
Revision: 810
http://cishell.svn.sourceforge.net/cishell/?rev=810&view=rev
Author: huangb
Date: 2008-09-18 21:20:17 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
add registerImage(DataProperty.TABLE_TYPE, matrixIcon);
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2008-09-18 20:31:40 UTC (rev 809)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2008-09-18 21:20:17 UTC (rev 810)
@@ -72,6 +72,7 @@
registerImage(DataProperty.TREE_TYPE, treeIcon);
registerImage(DataProperty.TEXT_TYPE, textIcon);
registerImage(DataProperty.PLOT_TYPE, plotIcon);
+ registerImage(DataProperty.TABLE_TYPE, matrixIcon);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-09-18 13:31:47
|
Revision: 809
http://cishell.svn.sourceforge.net/cishell/?rev=809&view=rev
Author: huangb
Date: 2008-09-18 20:31:40 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
remove debugging code
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogView.java
Modified: trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogView.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogView.java 2008-09-18 20:12:00 UTC (rev 808)
+++ trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogView.java 2008-09-18 20:31:40 UTC (rev 809)
@@ -228,7 +228,6 @@
if (index > -1) {
String url = message.substring(index);
- System.out.println(">>>url = "+url);
if (url.indexOf(") ") > -1) {
url = url.substring(0, url.indexOf(") "));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-09-18 13:12:04
|
Revision: 808
http://cishell.svn.sourceforge.net/cishell/?rev=808&view=rev
Author: huangb
Date: 2008-09-18 20:12:00 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Add documentation_url
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/load.properties
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/load.properties
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/load.properties 2008-09-18 19:43:31 UTC (rev 807)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/load.properties 2008-09-18 20:12:00 UTC (rev 808)
@@ -7,3 +7,4 @@
remoteable=true
prefs_published=local
receive_prefs=true
+documentation_url=https://nwb.slis.indiana.edu/community/?n=DataFormats.HomePage
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2008-09-05 18:59:57
|
Revision: 806
http://cishell.svn.sourceforge.net/cishell/?rev=806&view=rev
Author: mwlinnem
Date: 2008-09-05 18:59:54 +0000 (Fri, 05 Sep 2008)
Log Message:
-----------
New version using a URL instead of a URI. Makes it work on Hanning's computer. We'll see if it works elsewhere.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java 2008-09-04 21:08:59 UTC (rev 805)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java 2008-09-05 18:59:54 UTC (rev 806)
@@ -15,8 +15,8 @@
import java.io.File;
import java.io.IOException;
-import java.net.URI;
import java.net.URISyntaxException;
+import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -159,15 +159,15 @@
System.err.println(">>>app_location = "+app_location);
String fileFullPath = app_location + DEFAULT_MENU_FILE_NAME;
System.err.println(">>>fileFullPath = " + fileFullPath);
- URI configurationDirectoryURI = new URI(fileFullPath);
- System.err.println(">>>URI = " + configurationDirectoryURI.toString());
- System.err.println(">>> file at URI = " + new File(configurationDirectoryURI).toString());
- if (new File(configurationDirectoryURI).exists()) {
+ URL configurationDirectoryURL = new URL(fileFullPath);
+ System.err.println(">>>URL = " + configurationDirectoryURL.toString());
+ try {
+ configurationDirectoryURL.getContent();
System.out.println(">>>config.ini Exists!");
createMenuFromXML(fileFullPath);
processLeftServiceBundles();
-
- } else {
+ } catch (IOException e) {
+ e.printStackTrace();
System.err.println("config.ini does not exist... Reverting to backup plan");
initializeMenu();
}
@@ -175,8 +175,6 @@
} catch (InvalidSyntaxException e) {
getLog().log(LogService.LOG_DEBUG, "Invalid Syntax", e);
- } catch (URISyntaxException e) {
- getLog().log(LogService.LOG_DEBUG, "Invalid Syntax", e);
} catch (Throwable e) {
//Should catch absolutely everything catchable. Will hopefully reveal the error coming out of the URI constructor.
//No time to test today, just commiting this for testing later.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2008-09-04 21:09:02
|
Revision: 805
http://cishell.svn.sourceforge.net/cishell/?rev=805&view=rev
Author: mwlinnem
Date: 2008-09-04 21:08:59 +0000 (Thu, 04 Sep 2008)
Log Message:
-----------
Added code that should be helpful for debugging the URI problem.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java 2008-09-04 20:21:53 UTC (rev 804)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java 2008-09-04 21:08:59 UTC (rev 805)
@@ -155,18 +155,20 @@
* This piece of code needs to be reviewed and refactored!!!
*/
- System.out.println(">>>app_location = "+app_location);
+ //Better to use System.err, since it prints the stream immediately instead of storing it in a buffer which might be lost if there is a crash.
+ System.err.println(">>>app_location = "+app_location);
String fileFullPath = app_location + DEFAULT_MENU_FILE_NAME;
- System.out.println(">>>fileFullPath = " + fileFullPath);
+ System.err.println(">>>fileFullPath = " + fileFullPath);
URI configurationDirectoryURI = new URI(fileFullPath);
- System.out.println(">>>URI = " + configurationDirectoryURI.toString());
- System.out.println(">>> file at URI = " + new File(configurationDirectoryURI).toString());
+ System.err.println(">>>URI = " + configurationDirectoryURI.toString());
+ System.err.println(">>> file at URI = " + new File(configurationDirectoryURI).toString());
if (new File(configurationDirectoryURI).exists()) {
System.out.println(">>>config.ini Exists!");
createMenuFromXML(fileFullPath);
processLeftServiceBundles();
+
} else {
- System.out.println("config.ini does not exist... Reverting to backup plan");
+ System.err.println("config.ini does not exist... Reverting to backup plan");
initializeMenu();
}
Display.getDefault().asyncExec(updateAction);
@@ -175,6 +177,10 @@
getLog().log(LogService.LOG_DEBUG, "Invalid Syntax", e);
} catch (URISyntaxException e) {
getLog().log(LogService.LOG_DEBUG, "Invalid Syntax", e);
+ } catch (Throwable e) {
+ //Should catch absolutely everything catchable. Will hopefully reveal the error coming out of the URI constructor.
+ //No time to test today, just commiting this for testing later.
+ e.printStackTrace();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-09-04 20:21:56
|
Revision: 804
http://cishell.svn.sourceforge.net/cishell/?rev=804&view=rev
Author: huangb
Date: 2008-09-04 20:21:53 +0000 (Thu, 04 Sep 2008)
Log Message:
-----------
processLeftServiceBundles() is the followup function after createMenuFromXML(). Basically, it looks for any bundles that specifies the menu_path and label but not defined in the default_menu.xml file, and tries to add them to the menu.
If can not find {nwb_installation_dir}/configuration/default_menu.xml, call initializeMenu(), which will add algorithms to the menu based on menu_path and label specified in the properties files, but there's no control on the order of the algorithm list under each top menu.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java 2008-09-04 17:56:05 UTC (rev 803)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java 2008-09-04 20:21:53 UTC (rev 804)
@@ -162,12 +162,12 @@
System.out.println(">>>URI = " + configurationDirectoryURI.toString());
System.out.println(">>> file at URI = " + new File(configurationDirectoryURI).toString());
if (new File(configurationDirectoryURI).exists()) {
- System.out.println("config.ini Exists!");
- String fullpath = app_location + DEFAULT_MENU_FILE_NAME;
- createMenuFromXML(fullpath);
+ System.out.println(">>>config.ini Exists!");
+ createMenuFromXML(fileFullPath);
+ processLeftServiceBundles();
} else {
System.out.println("config.ini does not exist... Reverting to backup plan");
- processLeftServiceBundles();
+ initializeMenu();
}
Display.getDefault().asyncExec(updateAction);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2008-09-04 17:56:07
|
Revision: 803
http://cishell.svn.sourceforge.net/cishell/?rev=803&view=rev
Author: mwlinnem
Date: 2008-09-04 17:56:05 +0000 (Thu, 04 Sep 2008)
Log Message:
-----------
New way of getting the config.ini file which seems to work on various platforms better than the old one. It works on at least one platform that didn't work before, so it's good enough to upload and hope it works in general.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java 2008-09-04 14:41:47 UTC (rev 802)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/MenuAdapter.java 2008-09-04 17:56:05 UTC (rev 803)
@@ -13,13 +13,13 @@
* ***************************************************************************/
package org.cishell.reference.gui.menumanager.menu;
+import java.io.File;
import java.io.IOException;
-import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
-import java.net.URI;
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -101,27 +101,40 @@
+
public MenuAdapter(IMenuManager menu, Shell shell,
BundleContext bContext,CIShellContext ciContext,
IWorkbenchWindow window) {
+ //basic initialization
this.menuBar = menu;
this.shell = shell;
this.bContext = bContext;
this.ciContext = ciContext;
this.window = window;
+
this.algorithmToItemMap = new HashMap();
this.itemToParentMap = new HashMap();
+
pidToServiceReferenceMap = new HashMap();
pidToServiceReferenceMapCopy = new HashMap();
+ //appears to add a listener which updates the menu item whenever a
+ //corresponding change occurs in the bundle (registers, unregisters, etc...)
String filter = "(" + Constants.OBJECTCLASS +
"=" + AlgorithmFactory.class.getName() + ")";
+ listener = new ContextListener();
+
try {
- listener = new ContextListener();
+
bContext.addServiceListener(listener, filter);
preprocessServiceBundles();
String app_location = System.getProperty("osgi.configuration.area");
+
+ //Comments below refer to problems with earlier versions of this document.
+ //Keeping these around for now, as well as the system.out.printlns,
+ //until we are sure that the current fix works.
+
/*
* This is a temporary fix. A bit complex to explain the observation
* I got so far. On Windows XP
@@ -141,19 +154,27 @@
*
* This piece of code needs to be reviewed and refactored!!!
*/
+
System.out.println(">>>app_location = "+app_location);
- String fileFullpath = app_location.substring(6)+ DEFAULT_MENU_FILE_NAME;
- String fullpath = app_location+ DEFAULT_MENU_FILE_NAME;
- if (new File(fileFullpath).exists() || new File(fullpath).exists()){
- createMenuFromXML(fullpath);
- processLeftServiceBundles();
- }else{
- initializeMenu();
- }
+ String fileFullPath = app_location + DEFAULT_MENU_FILE_NAME;
+ System.out.println(">>>fileFullPath = " + fileFullPath);
+ URI configurationDirectoryURI = new URI(fileFullPath);
+ System.out.println(">>>URI = " + configurationDirectoryURI.toString());
+ System.out.println(">>> file at URI = " + new File(configurationDirectoryURI).toString());
+ if (new File(configurationDirectoryURI).exists()) {
+ System.out.println("config.ini Exists!");
+ String fullpath = app_location + DEFAULT_MENU_FILE_NAME;
+ createMenuFromXML(fullpath);
+ } else {
+ System.out.println("config.ini does not exist... Reverting to backup plan");
+ processLeftServiceBundles();
+ }
Display.getDefault().asyncExec(updateAction);
} catch (InvalidSyntaxException e) {
getLog().log(LogService.LOG_DEBUG, "Invalid Syntax", e);
+ } catch (URISyntaxException e) {
+ getLog().log(LogService.LOG_DEBUG, "Invalid Syntax", e);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
