cishell-svn Mailing List for Cyberinfrastructure Shell (CIShell) (Page 45)

Status: Beta

Brought to you by: bh2, katyb, kongchinhua

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

Flat | Threaded

<< < 1 .. 43 44 45 (Page 45 of 45)

[CIShell-SVN] SF.net SVN: cishell: [197] trunk/deployment/cishell-installer/

From: <bh...@us...> - 2006-09-15 15:42:59

Revision: 197
          http://svn.sourceforge.net/cishell/?rev=197&view=rev
Author:   bh2
Date:     2006-09-15 08:42:51 -0700 (Fri, 15 Sep 2006)

Log Message:
-----------
committing the cishell installer project

Property Changed:
----------------
    trunk/deployment/cishell-installer/


Property changes on: trunk/deployment/cishell-installer
___________________________________________________________________
Name: svn:ignore
   - 
cishell_full

   + 
cishell_full
cishell-installer*.jar



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [196] trunk/deployment/cishell-installer

From: <bh...@us...> - 2006-09-14 20:44:37

Revision: 196
          http://svn.sourceforge.net/cishell/?rev=196&view=rev
Author:   bh2
Date:     2006-09-14 13:43:46 -0700 (Thu, 14 Sep 2006)

Log Message:
-----------


Added Paths:
-----------
    trunk/deployment/cishell-installer/.cvsignore
    trunk/deployment/cishell-installer/.project
    trunk/deployment/cishell-installer/build.xml
    trunk/deployment/cishell-installer/cishell.product
    trunk/deployment/cishell-installer/cishell_linux/
    trunk/deployment/cishell-installer/cishell_linux/cishell
    trunk/deployment/cishell-installer/cishell_linux/icon.xpm
    trunk/deployment/cishell-installer/cishell_linux/libcairo-swt.so
    trunk/deployment/cishell-installer/cishell_linux/plugins/
    trunk/deployment/cishell-installer/cishell_linux/plugins/org.eclipse.core.filesystem.linux.x86_1.0.0.v20060603.jar
    trunk/deployment/cishell-installer/cishell_linux/plugins/org.eclipse.swt.gtk.linux.x86_3.2.0.v3232m.jar
    trunk/deployment/cishell-installer/cishell_macosx/
    trunk/deployment/cishell-installer/cishell_macosx/plugins/
    trunk/deployment/cishell-installer/cishell_macosx/plugins/org.eclipse.core.filesystem.macosx_1.0.0.v20060603.jar
    trunk/deployment/cishell-installer/cishell_macosx/plugins/org.eclipse.swt.carbon.macosx_3.2.0.v3232m.jar
    trunk/deployment/cishell-installer/cishell_macosx_ppc/
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Info.plist
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/MacOS/
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/MacOS/cishell
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/MacOS/cishell.ini
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/Splash.app/
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/Splash.app/Contents/
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/Splash.app/Contents/Info.plist
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/Splash.app/Contents/MacOS/
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/Splash.app/Contents/MacOS/cishell
    trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/cishell.icns
    trunk/deployment/cishell-installer/cishell_macosx_x86/
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Info.plist
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/MacOS/
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/MacOS/cishell
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/MacOS/cishell.ini
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/Splash.app/
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/Splash.app/Contents/
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/Splash.app/Contents/Info.plist
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/Splash.app/Contents/MacOS/
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/Splash.app/Contents/MacOS/cishell
    trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/cishell.icns
    trunk/deployment/cishell-installer/cishell_win32/
    trunk/deployment/cishell-installer/cishell_win32/cishell.exe
    trunk/deployment/cishell-installer/cishell_win32/cishell.ico
    trunk/deployment/cishell-installer/cishell_win32/plugins/
    trunk/deployment/cishell-installer/cishell_win32/plugins/org.eclipse.core.filesystem.win32.x86_1.0.0.v20060603.jar
    trunk/deployment/cishell-installer/cishell_win32/plugins/org.eclipse.swt.win32.win32.x86_3.2.0.v3232m.jar
    trunk/deployment/cishell-installer/cishell_win32/plugins/org.eclipse.update.core.win32_3.2.0.v20060605.jar
    trunk/deployment/cishell-installer/config.ini
    trunk/deployment/cishell-installer/icons/
    trunk/deployment/cishell-installer/icons/cishell.icns
    trunk/deployment/cishell-installer/icons/cishell.ico
    trunk/deployment/cishell-installer/icons/cishell.xpm
    trunk/deployment/cishell-installer/icons/ivc.gif
    trunk/deployment/cishell-installer/icons/ivc.ico
    trunk/deployment/cishell-installer/icons/ivc.xpm
    trunk/deployment/cishell-installer/icons/ivc_lg_16.bmp
    trunk/deployment/cishell-installer/icons/ivc_lg_32.bmp
    trunk/deployment/cishell-installer/icons/ivc_sm_16.bmp
    trunk/deployment/cishell-installer/icons/ivc_sm_32.bmp
    trunk/deployment/cishell-installer/icons/ivc_xlg_16.bmp
    trunk/deployment/cishell-installer/icons/ivc_xlg_32.bmp
    trunk/deployment/cishell-installer/install.xml
    trunk/deployment/cishell-installer/lib/
    trunk/deployment/cishell-installer/lib/standalone-compiler.jar
    trunk/deployment/cishell-installer/licenses/
    trunk/deployment/cishell-installer/licenses/license-apache-commons-collections.txt
    trunk/deployment/cishell-installer/licenses/license-cishell.txt
    trunk/deployment/cishell-installer/licenses/license-colt.txt
    trunk/deployment/cishell-installer/licenses/license-jung.txt
    trunk/deployment/cishell-installer/licenses/license-knopflerfish.txt
    trunk/deployment/cishell-installer/licenses/license-prefuse.txt
    trunk/deployment/cishell-installer/thanks.txt
    trunk/deployment/cishell-installer/unix_shortcut_specification.xml
    trunk/deployment/cishell-installer/windows_shortcut_specification.xml

Property Changed:
----------------
    trunk/deployment/cishell-installer/


Property changes on: trunk/deployment/cishell-installer
___________________________________________________________________
Name: svn:ignore
   + 
cishell_full


Added: trunk/deployment/cishell-installer/.cvsignore
===================================================================
--- trunk/deployment/cishell-installer/.cvsignore	                        (rev 0)
+++ trunk/deployment/cishell-installer/.cvsignore	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,3 @@
+ivc_full
+ivc_min
+ivc*.jar

Added: trunk/deployment/cishell-installer/.project
===================================================================
--- trunk/deployment/cishell-installer/.project	                        (rev 0)
+++ trunk/deployment/cishell-installer/.project	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cishell-installer</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.ibm.etools.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Added: trunk/deployment/cishell-installer/build.xml
===================================================================
--- trunk/deployment/cishell-installer/build.xml	                        (rev 0)
+++ trunk/deployment/cishell-installer/build.xml	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,42 @@
+<!--
+	CIShell: Cyberinfrastructure Shell (http://cishell.org/)
+
+	CIShell Installer ant build file.
+	
+	Note: this script assumes there is a full version of ivc extracted to:
+	${basedir}/cishell_full and ${basedir}/cishell_min
+	
+	Maintained by Bruce Herr.
+-->
+
+<project name='CIShell Installer' default='compile' basedir='.'>
+
+	<!--  Properties -->
+	<property name="version" value="0.0.1"/>
+	<property name="full.xml" value="install.xml"/>
+	<property name="min.xml" value="install.xml"/>
+	<property name="full.jar" value="cishell-installer_${version}.pre-ALPHA-R2.jar"/>
+	<property name="min.jar" value="cishell.${version}.minimal-installer.jar"/>
+
+
+	<!-- Allows us to use the IzPack Ant task -->
+	<taskdef name="izpack" classpath="${basedir}/lib/standalone-compiler.jar"
+	         classname="com.izforge.izpack.ant.IzPackTask"/>
+	
+	<target name='compile'>
+<!--    No need for a minimal installer at this time.
+		<echo message="Making the minimal CIShell installer using IzPack"/>
+		<izpack input="${basedir}/${min.xml}"
+	    	    output="${basedir}/${min.jar}"
+	        	installerType="standard"
+		        basedir="${basedir}/cishell_min"/>
+ -->
+
+		<echo message="Making the full CIShell installer using IzPack"/>
+		<izpack input="${basedir}/${full.xml}"
+	    	    output="${basedir}/${full.jar}"
+	        	installerType="standard"
+		        basedir="${basedir}/cishell_full"/>
+	</target>
+
+</project>
\ No newline at end of file

Added: trunk/deployment/cishell-installer/cishell.product
===================================================================
--- trunk/deployment/cishell-installer/cishell.product	                        (rev 0)
+++ trunk/deployment/cishell-installer/cishell.product	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.1"?>
+
+<product name="Cyberinfrastructure Shell" id="org.cishell.reference.gui.brand.cishell.cishell" application="org.cishell.reference.gui.workspace.CIShellApplication" useFeatures="true">
+
+   <aboutInfo>
+      <image path="icons/about.gif"/>
+      <text>
+         %blurb
+      </text>
+   </aboutInfo>
+
+   <configIni use="custom" path="/cishell-installer/config.ini"/>
+
+   <launcherArgs>
+   </launcherArgs>
+
+   <windowImages/>
+
+   <splash
+      location="org.cishell.reference.gui.brand.cishell"
+      startupProgressRect="0,163,500,10" />
+   <launcher name="cishell">
+      <linux icon="/cishell-installer/icons/cishell.xpm"/>
+      <macosx icon="/cishell-installer/icons/cishell.icns"/>
+      <solaris/>
+      <win useIco="true">
+         <ico path="/cishell-installer/icons/cishell.ico"/>
+         <bmp
+            winSmallHigh="icons/ivc_sm_32.bmp"
+            winSmallLow="icons/ivc_sm_16.bmp"
+            winMediumHigh="icons/ivc_lg_32.bmp"
+            winMediumLow="icons/ivc_lg_16.bmp"
+            winLargeHigh="icons/ivc_xlg_32.bmp"
+            winLargeLow="icons/ivc_xlg_16.bmp"/>
+      </win>
+   </launcher>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.cishell.algorithm.examples.feature" version="0.0.1.qualifier"/>
+      <feature id="org.cishell.environment.equinox.feature" version="0.0.1"/>
+      <feature id="org.cishell.feature" version="0.0.1.qualifier"/>
+      <feature id="org.cishell.reference.feature" version="0.0.1.qualifier"/>
+      <feature id="org.cishell.reference.gui.feature" version="0.0.1.qualifier"/>
+   </features>
+
+</product>

Added: trunk/deployment/cishell-installer/cishell_linux/cishell
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_linux/cishell
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_linux/icon.xpm
===================================================================
--- trunk/deployment/cishell-installer/cishell_linux/icon.xpm	                        (rev 0)
+++ trunk/deployment/cishell-installer/cishell_linux/icon.xpm	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,1606 @@
+/* XPM */
+static char * icon_xpm[] = {
+"48 48 1555 2",
+"  	c None",
+". 	c #7BAF2B",
+"+ 	c #74AA26",
+"@ 	c #67A11D",
+"# 	c #589612",
+"$ 	c #4D8F0B",
+"% 	c #438805",
+"& 	c #3D8402",
+"* 	c #3F8605",
+"= 	c #4B8E0E",
+"- 	c #5B991A",
+"; 	c #69A226",
+"> 	c #79AD33",
+", 	c #87B63D",
+"' 	c #8EBB3F",
+") 	c #8FBB35",
+"! 	c #8EBB2B",
+"~ 	c #8FBC29",
+"{ 	c #92BD2D",
+"] 	c #96BF33",
+"^ 	c #9CC33B",
+"/ 	c #A4C845",
+"( 	c #ACCD4F",
+"_ 	c #B3D155",
+": 	c #B9D457",
+"< 	c #BED657",
+"[ 	c #C1D758",
+"} 	c #C3D859",
+"| 	c #C2D859",
+"1 	c #BDD554",
+"2 	c #B3D04B",
+"3 	c #A9CA41",
+"4 	c #A1C639",
+"5 	c #9CC334",
+"6 	c #98C230",
+"7 	c #96C12E",
+"8 	c #98C12F",
+"9 	c #99C230",
+"0 	c #9AC230",
+"a 	c #98C22F",
+"b 	c #97C12F",
+"c 	c #96C12D",
+"d 	c #96C02D",
+"e 	c #97C130",
+"f 	c #9AC335",
+"g 	c #9CC53B",
+"h 	c #9EC63D",
+"i 	c #599713",
+"j 	c #4E8F0C",
+"k 	c #448806",
+"l 	c #3D8403",
+"m 	c #408606",
+"n 	c #4C8E0F",
+"o 	c #5B991B",
+"p 	c #69A326",
+"q 	c #8EBB3E",
+"r 	c #9AC231",
+"s 	c #74AA25",
+"t 	c #72A827",
+"u 	c #6FA52A",
+"v 	c #6AA22D",
+"w 	c #669E2E",
+"x 	c #629B2E",
+"y 	c #5E992D",
+"z 	c #5F9A2E",
+"A 	c #649D2F",
+"B 	c #6AA231",
+"C 	c #71A733",
+"D 	c #7AAD38",
+"E 	c #83B33B",
+"F 	c #89B739",
+"G 	c #8BB932",
+"H 	c #8DBA2A",
+"I 	c #90BC29",
+"J 	c #93BE2D",
+"K 	c #97C034",
+"L 	c #A4C846",
+"M 	c #ADCD50",
+"N 	c #B4D156",
+"O 	c #BBD558",
+"P 	c #C1D759",
+"Q 	c #C4D95A",
+"R 	c #C6D95B",
+"S 	c #C5D95B",
+"T 	c #BFD656",
+"U 	c #B5D14C",
+"V 	c #AACB42",
+"W 	c #A2C73A",
+"X 	c #9CC435",
+"Y 	c #98C231",
+"Z 	c #98C130",
+"` 	c #9BC232",
+" .	c #9BC332",
+"..	c #9AC332",
+"+.	c #9CC437",
+"@.	c #A0C73F",
+"#.	c #66A01A",
+"$.	c #6EA528",
+"%.	c #7FAE45",
+"&.	c #90B963",
+"*.	c #9BBF77",
+"=.	c #A1C483",
+"-.	c #A4C589",
+";.	c #A1C384",
+">.	c #96BD73",
+",.	c #89B55F",
+"'.	c #82B150",
+").	c #7DAE42",
+"!.	c #7BAE36",
+"~.	c #7DAF2E",
+"{.	c #84B42A",
+"].	c #8BB928",
+"^.	c #91BD29",
+"/.	c #94BF2E",
+"(.	c #97C134",
+"_.	c #9DC43C",
+":.	c #A5C948",
+"<.	c #AECE52",
+"[.	c #B6D359",
+"}.	c #BFD75B",
+"|.	c #C6DA5C",
+"1.	c #CADC5D",
+"2.	c #CCDC5F",
+"3.	c #CBDC5E",
+"4.	c #C5D959",
+"5.	c #B9D34F",
+"6.	c #ACCD44",
+"7.	c #A4C83C",
+"8.	c #9DC536",
+"9.	c #99C232",
+"0.	c #98C132",
+"a.	c #9AC234",
+"b.	c #9CC335",
+"c.	c #9FC537",
+"d.	c #A1C638",
+"e.	c #A2C638",
+"f.	c #A1C637",
+"g.	c #A0C536",
+"h.	c #A0C638",
+"i.	c #A1C63C",
+"j.	c #A2C841",
+"k.	c #A3C843",
+"l.	c #58960E",
+"m.	c #59960F",
+"n.	c #6AA129",
+"o.	c #8FB860",
+"p.	c #B5D09A",
+"q.	c #CFE0C0",
+"r.	c #E1ECD9",
+"s.	c #EAF2E4",
+"t.	c #E2EDDA",
+"u.	c #C8DCB8",
+"v.	c #A9C88E",
+"w.	c #92BA6C",
+"x.	c #80AF4C",
+"y.	c #73A831",
+"z.	c #72A723",
+"A.	c #7CAF22",
+"B.	c #8AB926",
+"C.	c #92BE2A",
+"D.	c #95C02E",
+"E.	c #98C135",
+"F.	c #9EC53D",
+"G.	c #A6CA49",
+"H.	c #AFCF54",
+"I.	c #B8D45B",
+"J.	c #C2D85E",
+"K.	c #CBDC60",
+"L.	c #D0DE61",
+"M.	c #D2DF63",
+"N.	c #D0DF62",
+"O.	c #CADB5D",
+"P.	c #BDD552",
+"Q.	c #AFCE46",
+"R.	c #A5C93E",
+"S.	c #9FC638",
+"T.	c #9AC334",
+"U.	c #99C233",
+"V.	c #9BC336",
+"W.	c #9EC538",
+"X.	c #A3C73B",
+"Y.	c #A7C93E",
+"Z.	c #A9CA3F",
+"`.	c #A8CA3E",
+" +	c #A7C93D",
+".+	c #A6C93E",
+"++	c #A6C941",
+"@+	c #A7C945",
+"#+	c #A7C946",
+"$+	c #519108",
+"%+	c #529109",
+"&+	c #689F29",
+"*+	c #96BC6D",
+"=+	c #C7DBB4",
+"-+	c #E7F0E2",
+";+	c #FFFFFF",
+">+	c #DFEBD8",
+",+	c #B7D1A4",
+"'+	c #9ABF79",
+")+	c #81B050",
+"!+	c #70A52E",
+"~+	c #6CA41E",
+"{+	c #79AD1E",
+"]+	c #93BF2B",
+"^+	c #96C12F",
+"/+	c #99C236",
+"(+	c #9FC53E",
+"_+	c #A7CB4A",
+":+	c #B0D056",
+"<+	c #BAD55D",
+"[+	c #C4DA60",
+"}+	c #CDDD61",
+"|+	c #D2E063",
+"1+	c #D4E164",
+"2+	c #D2E064",
+"3+	c #CCDD5E",
+"4+	c #BED653",
+"5+	c #B0CF47",
+"6+	c #A6CA3F",
+"7+	c #9FC639",
+"8+	c #9BC335",
+"9+	c #99C234",
+"0+	c #9CC337",
+"a+	c #A0C53A",
+"b+	c #A6C83E",
+"c+	c #ABCB41",
+"d+	c #AECC43",
+"e+	c #ADCC42",
+"f+	c #ACCB41",
+"g+	c #AACB44",
+"h+	c #A9CB47",
+"i+	c #A9CA48",
+"j+	c #519107",
+"k+	c #E8F0E2",
+"l+	c #E0EBD8",
+"m+	c #B8D1A4",
+"n+	c #9BBF79",
+"o+	c #82B04F",
+"p+	c #71A62D",
+"q+	c #6EA51D",
+"r+	c #7BAE1F",
+"s+	c #8CBA28",
+"t+	c #95C02D",
+"u+	c #9BC337",
+"v+	c #A1C73F",
+"w+	c #AACC4C",
+"x+	c #B4D258",
+"y+	c #BDD75F",
+"z+	c #C7DC62",
+"A+	c #CFDF63",
+"B+	c #D3E164",
+"C+	c #D5E266",
+"D+	c #D4E265",
+"E+	c #CDDE60",
+"F+	c #C0D755",
+"G+	c #B2D049",
+"H+	c #A8CA40",
+"I+	c #A0C63A",
+"J+	c #9AC235",
+"K+	c #9DC437",
+"L+	c #A1C63A",
+"M+	c #A8C93F",
+"N+	c #B0CE45",
+"O+	c #B0CE44",
+"P+	c #AFCD43",
+"Q+	c #AECC44",
+"R+	c #ACCC46",
+"S+	c #ABCB48",
+"T+	c #ABCB49",
+"U+	c #529208",
+"V+	c #539209",
+"W+	c #68A028",
+"X+	c #94BB68",
+"Y+	c #C2D8AC",
+"Z+	c #E1ECD8",
+"`+	c #F8FAF6",
+" @	c #F9FBF8",
+".@	c #D9E7CF",
+"+@	c #B4CF9D",
+"@@	c #98BE74",
+"#@	c #81B04C",
+"$@	c #71A62C",
+"%@	c #6FA51D",
+"&@	c #7CAF20",
+"*@	c #8CBA2A",
+"=@	c #95C02F",
+"-@	c #98C232",
+";@	c #9AC337",
+">@	c #A0C63F",
+",@	c #AACC4B",
+"'@	c #B3D257",
+")@	c #BCD75E",
+"!@	c #C4DA61",
+"~@	c #CBDD61",
+"{@	c #CFDF62",
+"]@	c #D0E064",
+"^@	c #C9DC5E",
+"/@	c #BDD654",
+"(@	c #B1CF49",
+"_@	c #A7C941",
+":@	c #9BC235",
+"<@	c #9EC437",
+"[@	c #A2C63A",
+"}@	c #B2CE46",
+"|@	c #B2CE45",
+"1@	c #B1CE45",
+"2@	c #B0CD45",
+"3@	c #AECD47",
+"4@	c #ACCC48",
+"5@	c #ABCC49",
+"6@	c #539309",
+"7@	c #68A027",
+"8@	c #93BB67",
+"9@	c #C1D7AA",
+"0@	c #DFEBD6",
+"a@	c #F6F9F4",
+"b@	c #F7FAF5",
+"c@	c #D8E6CD",
+"d@	c #B3CE9B",
+"e@	c #97BD72",
+"f@	c #7EAD4A",
+"g@	c #6BA228",
+"h@	c #67A019",
+"i@	c #72A81B",
+"j@	c #82B324",
+"k@	c #8BB929",
+"l@	c #90BC2E",
+"m@	c #94BF33",
+"n@	c #9AC23A",
+"o@	c #A1C745",
+"p@	c #A9CB4F",
+"q@	c #AECE55",
+"r@	c #B3D056",
+"s@	c #B7D155",
+"t@	c #B9D256",
+"u@	c #BAD357",
+"v@	c #BAD256",
+"w@	c #B6D053",
+"x@	c #AFCD4C",
+"y@	c #A7C944",
+"z@	c #A2C63E",
+"A@	c #9EC439",
+"B@	c #9AC233",
+"C@	c #9BC334",
+"D@	c #9EC436",
+"E@	c #A2C639",
+"F@	c #B2CF46",
+"G@	c #B3CF46",
+"H@	c #B1CE46",
+"I@	c #AFCD47",
+"J@	c #ADCC48",
+"K@	c #ACCC49",
+"L@	c #529207",
+"M@	c #539308",
+"N@	c #94BB70",
+"O@	c #75A844",
+"P@	c #5D981F",
+"Q@	c #55930C",
+"R@	c #5C980C",
+"S@	c #68A113",
+"T@	c #72A818",
+"U@	c #7DAF20",
+"V@	c #86B528",
+"W@	c #8CB92F",
+"X@	c #8FBB37",
+"Y@	c #90BB3C",
+"Z@	c #91BB3E",
+"`@	c #8FB93C",
+" #	c #8EB739",
+".#	c #8DB738",
+"+#	c #8DB637",
+"@#	c #8DB638",
+"##	c #8FB838",
+"$#	c #92BB39",
+"%#	c #96BE39",
+"&#	c #98C038",
+"*#	c #99C136",
+"=#	c #9AC232",
+"-#	c #9BC333",
+";#	c #9DC335",
+">#	c #A1C539",
+",#	c #B2CF45",
+"'#	c #ACCD48",
+")#	c #D9E6CD",
+"!#	c #B2CE9B",
+"~#	c #91B970",
+"{#	c #6FA342",
+"]#	c #53911B",
+"^#	c #478A07",
+"/#	c #4B8D05",
+"(#	c #55940B",
+"_#	c #609B10",
+":#	c #6DA418",
+"<#	c #7AAD21",
+"[#	c #7FB027",
+"}#	c #7EAF2C",
+"|#	c #7AAC2F",
+"1#	c #76AA2E",
+"2#	c #71A52A",
+"3#	c #6BA225",
+"4#	c #689F23",
+"5#	c #679E22",
+"6#	c #679F23",
+"7#	c #6DA325",
+"8#	c #77AA2A",
+"9#	c #83B22F",
+"0#	c #8BB831",
+"a#	c #91BD31",
+"b#	c #96C030",
+"c#	c #99C231",
+"d#	c #A5C83C",
+"e#	c #AFCD44",
+"f#	c #B0CE43",
+"g#	c #AFCE44",
+"h#	c #ADCD45",
+"i#	c #ABCC47",
+"j#	c #AACC48",
+"k#	c #529209",
+"l#	c #53930A",
+"m#	c #93BB68",
+"n#	c #C1D7AB",
+"o#	c #D7E6CC",
+"p#	c #B1CD9A",
+"q#	c #91B972",
+"r#	c #72A54A",
+"s#	c #59952A",
+"t#	c #508F1A",
+"u#	c #56931D",
+"v#	c #619B25",
+"w#	c #6AA029",
+"x#	c #72A62A",
+"y#	c #79AB2B",
+"z#	c #7CAD2E",
+"A#	c #7BAC33",
+"B#	c #78AA38",
+"C#	c #75A83A",
+"D#	c #70A538",
+"E#	c #6CA236",
+"F#	c #6AA135",
+"G#	c #6AA036",
+"H#	c #6BA136",
+"I#	c #6DA334",
+"J#	c #70A62F",
+"K#	c #75AA29",
+"L#	c #7DAF28",
+"M#	c #88B729",
+"N#	c #92BE2C",
+"O#	c #97C12E",
+"P#	c #97C02F",
+"Q#	c #A0C537",
+"R#	c #A6C83C",
+"S#	c #ABCB40",
+"T#	c #ACCC40",
+"U#	c #ACCC41",
+"V#	c #ABCC43",
+"W#	c #A9CB46",
+"X#	c #52920B",
+"Y#	c #53930C",
+"Z#	c #68A02A",
+"`#	c #93BB69",
+" $	c #D5E4CA",
+".$	c #AECC99",
+"+$	c #94BA77",
+"@$	c #7FAD5E",
+"#$	c #71A44C",
+"$$	c #70A349",
+"%$	c #7DAC56",
+"&$	c #8DB665",
+"*$	c #90B864",
+"=$	c #8AB555",
+"-$	c #81B046",
+";$	c #80AF43",
+">$	c #83B14D",
+",$	c #87B459",
+"'$	c #8BB661",
+")$	c #8EB867",
+"!$	c #91B96C",
+"~$	c #93BB70",
+"{$	c #97BD76",
+"]$	c #8FB868",
+"^$	c #7DAD48",
+"/$	c #6CA428",
+"($	c #6BA41B",
+"_$	c #7AAE1E",
+":$	c #8BB926",
+"<$	c #92BE29",
+"[$	c #93BE29",
+"}$	c #92BD29",
+"|$	c #94BE2C",
+"1$	c #9DC334",
+"2$	c #A3C739",
+"3$	c #A5C83B",
+"4$	c #A6C93D",
+"5$	c #A6C940",
+"6$	c #A6C943",
+"7$	c #A6C945",
+"8$	c #52920E",
+"9$	c #53930E",
+"0$	c #68A02C",
+"a$	c #93BB6A",
+"b$	c #C1D7AC",
+"c$	c #D3E3C8",
+"d$	c #ACCA97",
+"e$	c #96BC7D",
+"f$	c #8DB673",
+"g$	c #8CB572",
+"h$	c #93B97A",
+"i$	c #A9C893",
+"j$	c #BDD5A8",
+"k$	c #BCD4A4",
+"l$	c #A6C684",
+"m$	c #8EB764",
+"n$	c #87B35C",
+"o$	c #8FB86A",
+"p$	c #9CC17E",
+"q$	c #A7C78E",
+"r$	c #B3CF9C",
+"s$	c #BDD5A9",
+"t$	c #C4D9B1",
+"u$	c #CBDDBB",
+"v$	c #CADDB9",
+"w$	c #B7D19E",
+"x$	c #8DB763",
+"y$	c #659F29",
+"z$	c #5B990F",
+"A$	c #6DA513",
+"B$	c #84B520",
+"C$	c #8EBB24",
+"D$	c #8EBB23",
+"E$	c #8CBA23",
+"F$	c #8DBA25",
+"G$	c #90BC28",
+"H$	c #9FC436",
+"I$	c #A2C73D",
+"J$	c #A3C741",
+"K$	c #52920F",
+"L$	c #53930F",
+"M$	c #68A02D",
+"N$	c #93BB6B",
+"O$	c #D1E1C6",
+"P$	c #A9C895",
+"Q$	c #97BD80",
+"R$	c #95BB7F",
+"S$	c #9CBF89",
+"T$	c #AAC899",
+"U$	c #C5D9B9",
+"V$	c #DCE8D2",
+"W$	c #D8E6CC",
+"X$	c #B9D2A3",
+"Y$	c #98BE7A",
+"Z$	c #8FB86F",
+"`$	c #9ABF7F",
+" %	c #ABCA97",
+".%	c #B9D3AA",
+"+%	c #CADEBE",
+"@%	c #E6EFE0",
+"#%	c #C8DCB6",
+"$%	c #93BB6E",
+"%%	c #619C28",
+"&%	c #539409",
+"*%	c #66A10D",
+"=%	c #81B31C",
+"-%	c #8BBA20",
+";%	c #8AB91F",
+">%	c #87B71F",
+",%	c #87B720",
+"'%	c #8AB924",
+")%	c #8EBB28",
+"!%	c #92BD2C",
+"~%	c #97C030",
+"{%	c #9FC538",
+"]%	c #A1C63D",
+"^%	c #A2C741",
+"/%	c #A2C743",
+"(%	c #E0EBD6",
+"_%	c #F5F9F4",
+":%	c #CFE0C4",
+"<%	c #A7C693",
+"[%	c #97BC81",
+"}%	c #9ABE86",
+"|%	c #A6C597",
+"1%	c #B7D0AC",
+"2%	c #D5E4CE",
+"3%	c #EDF3E9",
+"4%	c #E9F1E3",
+"5%	c #C7DBB8",
+"6%	c #A3C58B",
+"7%	c #99BE7F",
+"8%	c #A4C58D",
+"9%	c #B6D1A5",
+"0%	c #C7DBB9",
+"a%	c #DBE8D2",
+"b%	c #EBF2E6",
+"c%	c #F1F6EE",
+"d%	c #F0F5EC",
+"e%	c #E4EEDD",
+"f%	c #C7DCB6",
+"g%	c #92BA6D",
+"h%	c #619C27",
+"i%	c #539407",
+"j%	c #67A20C",
+"k%	c #82B41B",
+"l%	c #8BBA1E",
+"m%	c #88B81C",
+"n%	c #82B41D",
+"o%	c #87B721",
+"p%	c #8EBB27",
+"q%	c #A2C63B",
+"r%	c #A3C83F",
+"s%	c #F5F9F3",
+"t%	c #CDDFC3",
+"u%	c #A5C592",
+"v%	c #96BB81",
+"w%	c #9CBF8A",
+"x%	c #ACC99E",
+"y%	c #BFD6B6",
+"z%	c #DFEADA",
+"A%	c #F8FAF7",
+"B%	c #F4F8F1",
+"C%	c #D2E3C6",
+"D%	c #AECC9A",
+"E%	c #A4C68D",
+"F%	c #AFCD9A",
+"G%	c #C2D9B1",
+"H%	c #D3E3C6",
+"I%	c #E7F0E1",
+"J%	c #FAFCF9",
+"K%	c #F2F6EF",
+"L%	c #E0EBD7",
+"M%	c #C1D8AD",
+"N%	c #8FB867",
+"O%	c #619C25",
+"P%	c #549507",
+"Q%	c #68A30B",
+"R%	c #81B419",
+"S%	c #89B91D",
+"T%	c #84B61B",
+"U%	c #7DB119",
+"V%	c #7DB11C",
+"W%	c #83B521",
+"X%	c #8BBA28",
+"Y%	c #92BE2D",
+"Z%	c #99C133",
+"`%	c #A2C73C",
+" &	c #A4C841",
+".&	c #A4C944",
+"+&	c #A4C946",
+"@&	c #A4C491",
+"#&	c #96BB80",
+"$&	c #9DC08A",
+"%&	c #ADCBA0",
+"&&	c #C2D8B9",
+"*&	c #E3EDDF",
+"=&	c #FEFEFE",
+"-&	c #FCFDFB",
+";&	c #DCE9D3",
+">&	c #BAD3A8",
+",&	c #B1CE9D",
+"'&	c #BDD6AC",
+")&	c #D1E2C3",
+"!&	c #E1ECD7",
+"~&	c #F3F7EF",
+"{&	c #F3F8F1",
+"]&	c #DEEAD5",
+"^&	c #BED6A8",
+"/&	c #8CB764",
+"(&	c #5F9B23",
+"_&	c #519305",
+":&	c #5F9D07",
+"<&	c #75AB13",
+"[&	c #7CB017",
+"}&	c #79AE19",
+"|&	c #75AB1B",
+"1&	c #75AB1D",
+"2&	c #79AE20",
+"3&	c #7FB124",
+"4&	c #85B528",
+"5&	c #8CB92D",
+"6&	c #94BD32",
+"7&	c #99C137",
+"8&	c #A0C640",
+"9&	c #A1C742",
+"0&	c #CEDFC3",
+"a&	c #A5C591",
+"b&	c #96BB7F",
+"c&	c #9BBF86",
+"d&	c #ABC999",
+"e&	c #BFD6B2",
+"f&	c #E0ECDB",
+"g&	c #FDFDFD",
+"h&	c #E3EDDB",
+"i&	c #C6DBB7",
+"j&	c #C1D8B0",
+"k&	c #D0E1C2",
+"l&	c #F0F6EB",
+"m&	c #FEFFFE",
+"n&	c #F2F7EE",
+"o&	c #DCE9D2",
+"p&	c #BCD5A6",
+"q&	c #8AB562",
+"r&	c #5C9821",
+"s&	c #488C00",
+"t&	c #4C8F00",
+"u&	c #579702",
+"v&	c #5D9B07",
+"w&	c #619D11",
+"x&	c #659F1A",
+"y&	c #66A01D",
+"z&	c #649E19",
+"A&	c #639D15",
+"B&	c #67A015",
+"C&	c #6FA51A",
+"D&	c #7AAC21",
+"E&	c #83B227",
+"F&	c #8DB92F",
+"G&	c #96BF36",
+"H&	c #F6F9F3",
+"I&	c #CEE0C3",
+"J&	c #A6C691",
+"K&	c #96BC7E",
+"L&	c #99BE80",
+"M&	c #A6C690",
+"N&	c #B9D3A8",
+"O&	c #FEFEFD",
+"P&	c #E8F1E1",
+"Q&	c #CFE1C0",
+"R&	c #F4F8F0",
+"S&	c #FBFDFA",
+"T&	c #EDF4E8",
+"U&	c #D8E7CC",
+"V&	c #B8D2A0",
+"W&	c #87B35E",
+"X&	c #58951F",
+"Y&	c #418700",
+"Z&	c #3D8500",
+"`&	c #438800",
+" *	c #498C04",
+".*	c #549315",
+"+*	c #5F9A25",
+"@*	c #609B28",
+"#*	c #58951E",
+"$*	c #519013",
+"%*	c #52910F",
+"&*	c #5A9712",
+"**	c #659E18",
+"=*	c #71A61E",
+"-*	c #7EAF25",
+";*	c #8BB82D",
+">*	c #91BC30",
+",*	c #53920F",
+"'*	c #A7C792",
+")*	c #96BC7C",
+"!*	c #A0C389",
+"~*	c #B4D0A1",
+"{*	c #D7E6CE",
+"]*	c #F7FAF6",
+"^*	c #EBF3E4",
+"/*	c #D6E5C9",
+"(*	c #D6E5C8",
+"_*	c #E8F0E0",
+":*	c #FCFDFA",
+"<*	c #F9FBF7",
+"[*	c #D0E2C2",
+"}*	c #B0CD96",
+"|*	c #80AF57",
+"1*	c #55931E",
+"2*	c #428706",
+"3*	c #478A0C",
+"4*	c #54921E",
+"5*	c #6CA13F",
+"6*	c #77A94F",
+"7*	c #79A952",
+"8*	c #70A447",
+"9*	c #679D3A",
+"0*	c #649C33",
+"a*	c #679F30",
+"b*	c #6CA32E",
+"c*	c #72A72B",
+"d*	c #7AAD29",
+"e*	c #82B227",
+"f*	c #85B426",
+"g*	c #549310",
+"h*	c #69A02D",
+"i*	c #94BB6B",
+"j*	c #C1D8AB",
+"k*	c #95BB7B",
+"l*	c #92BA79",
+"m*	c #9ABF84",
+"n*	c #AECC9C",
+"o*	c #D4E4CA",
+"p*	c #F6FAF5",
+"q*	c #EBF2E4",
+"r*	c #D5E5C7",
+"s*	c #D4E4C7",
+"t*	c #E7F0DF",
+"u*	c #E0ECD7",
+"v*	c #C4DAB1",
+"w*	c #A2C485",
+"x*	c #75A74A",
+"y*	c #4C8D15",
+"z*	c #699F3B",
+"A*	c #8DB66B",
+"B*	c #A2C487",
+"C*	c #ADCB97",
+"D*	c #B4CF9F",
+"E*	c #B5D0A1",
+"F*	c #B1CD9C",
+"G*	c #A9C892",
+"H*	c #A2C386",
+"I*	c #99BE76",
+"J*	c #8FB964",
+"K*	c #87B450",
+"L*	c #7FAF39",
+"M*	c #78AC23",
+"N*	c #75AA19",
+"O*	c #559410",
+"P*	c #569411",
+"Q*	c #6AA12E",
+"R*	c #95BC6B",
+"S*	c #F7FAF4",
+"T*	c #D0E1C4",
+"U*	c #94BB7B",
+"V*	c #8EB775",
+"W*	c #94BB7E",
+"X*	c #A7C796",
+"Y*	c #D0E1C7",
+"Z*	c #FFFFFE",
+"`*	c #EAF2E3",
+" =	c #D4E4C6",
+".=	c #D2E3C5",
+"+=	c #E5EEDC",
+"@=	c #F5F9F2",
+"#=	c #B6D1A0",
+"$=	c #95BB75",
+"%=	c #6CA140",
+"&=	c #4F8F1C",
+"*=	c #5A952A",
+"==	c #CBDEBB",
+"-=	c #E8F1E2",
+";=	c #EFF5EB",
+">=	c #F0F6EC",
+",=	c #EEF4E9",
+"'=	c #E3EDDA",
+")=	c #B9D3A0",
+"!=	c #A2C57C",
+"~=	c #88B54E",
+"{=	c #72A724",
+"]=	c #67A010",
+"^=	c #599514",
+"/=	c #599614",
+"(=	c #6DA332",
+"_=	c #97BD6F",
+":=	c #C4D9AF",
+"<=	c #E2ECD9",
+"[=	c #F8FBF6",
+"}=	c #D2E2C7",
+"|=	c #8BB572",
+"1=	c #8DB676",
+"2=	c #A0C38E",
+"3=	c #CBDEC2",
+"4=	c #F4F8F3",
+"5=	c #EEF4E8",
+"6=	c #D9E7CD",
+"7=	c #E7F0E0",
+"8=	c #F9FCF8",
+"9=	c #D2E2C5",
+"0=	c #ADCA95",
+"a=	c #8EB66D",
+"b=	c #6CA143",
+"c=	c #59952B",
+"d=	c #6BA043",
+"e=	c #EFF5EC",
+"f=	c #D6E5CB",
+"g=	c #BAD4A0",
+"h=	c #95BD65",
+"i=	c #73A82F",
+"j=	c #639E14",
+"k=	c #5D981A",
+"l=	c #5E981A",
+"m=	c #72A538",
+"n=	c #9DC076",
+"o=	c #CADDB8",
+"p=	c #DAE7D3",
+"q=	c #B0CC9E",
+"r=	c #97BC80",
+"s=	c #88B36F",
+"t=	c #85B16C",
+"u=	c #97BC82",
+"v=	c #C5DABA",
+"w=	c #F2F7F0",
+"x=	c #E5EFDD",
+"y=	c #E4EEDC",
+"z=	c #EFF5EA",
+"A=	c #F3F7F0",
+"B=	c #CDDFC0",
+"C=	c #A6C68E",
+"D=	c #8CB56D",
+"E=	c #76A753",
+"F=	c #6FA24A",
+"G=	c #83B064",
+"H=	c #BBD3AA",
+"I=	c #F3F7F1",
+"J=	c #F6FAF4",
+"K=	c #EEF5EB",
+"L=	c #D3E3C3",
+"M=	c #A7C883",
+"N=	c #7EAE46",
+"O=	c #6AA128",
+"P=	c #649C21",
+"Q=	c #649C22",
+"R=	c #78A93E",
+"S=	c #A0C27A",
+"T=	c #CBDEB9",
+"U=	c #DAE8D3",
+"V=	c #B1CD9F",
+"W=	c #84B06A",
+"X=	c #7FAC63",
+"Y=	c #91B879",
+"Z=	c #C0D6B3",
+"`=	c #FDFEFC",
+" -	c #F2F7EF",
+".-	c #C9DDBB",
+"+-	c #9FC288",
+"@-	c #8AB46D",
+"#-	c #82AF64",
+"$-	c #86B169",
+"%-	c #9BBF84",
+"&-	c #C9DCBC",
+"*-	c #F4F8F2",
+"=-	c #F2F7ED",
+"--	c #DFEBD4",
+";-	c #DEEAD3",
+">-	c #ECF3E6",
+",-	c #FDFDFC",
+"'-	c #E8F1E0",
+")-	c #B8D29E",
+"!-	c #89B45C",
+"~-	c #73A63D",
+"{-	c #6FA328",
+"]-	c #6FA329",
+"^-	c #7EAD40",
+"/-	c #9CC06F",
+"(-	c #BCD4A1",
+"_-	c #D1E2C2",
+":-	c #E3EDD9",
+"<-	c #C2D8B2",
+"[-	c #A0C387",
+"}-	c #8CB66F",
+"|-	c #7FAD60",
+"1-	c #7DAB5E",
+"2-	c #91B878",
+"3-	c #C0D6B2",
+"4-	c #F0F5ED",
+"5-	c #FBFCFA",
+"6-	c #F0F6ED",
+"7-	c #C2D8B4",
+"8-	c #83B066",
+"9-	c #94BA7C",
+"0-	c #ACC999",
+"a-	c #D4E3CA",
+"b-	c #E7F0DE",
+"c-	c #CDE0BD",
+"d-	c #CCDFBB",
+"e-	c #E0ECD6",
+"f-	c #8EB767",
+"g-	c #77A847",
+"h-	c #80AE31",
+"i-	c #80AE32",
+"j-	c #84B13D",
+"k-	c #8EB753",
+"l-	c #98BD6B",
+"m-	c #9FC17A",
+"n-	c #A3C485",
+"o-	c #A3C488",
+"p-	c #9CC080",
+"q-	c #8BB569",
+"r-	c #7BAB52",
+"s-	c #75A74B",
+"t-	c #77A850",
+"u-	c #81AE60",
+"v-	c #9ABE80",
+"w-	c #C6DAB8",
+"x-	c #FDFEFD",
+"y-	c #EFF4EB",
+"z-	c #BAD3AA",
+"A-	c #88B36C",
+"B-	c #77A857",
+"C-	c #84B066",
+"D-	c #9CC084",
+"E-	c #B6D0A4",
+"F-	c #DBE8D3",
+"G-	c #FBFDF9",
+"H-	c #DCE9D0",
+"I-	c #BBD4A6",
+"J-	c #D7E6CB",
+"K-	c #F8FAF5",
+"L-	c #C3D9AE",
+"M-	c #90B868",
+"N-	c #77A848",
+"O-	c #90B93A",
+"P-	c #8CB639",
+"Q-	c #82B038",
+"R-	c #78A937",
+"S-	c #6FA334",
+"T-	c #679E31",
+"U-	c #60992E",
+"V-	c #5C9629",
+"W-	c #589420",
+"X-	c #58951D",
+"Y-	c #609A28",
+"Z-	c #6FA440",
+"`-	c #84B160",
+" ;	c #A2C488",
+".;	c #CCDEBE",
+"+;	c #EDF3E8",
+"@;	c #B2CEA0",
+"#;	c #7BAA5C",
+"$;	c #6CA148",
+"%;	c #80AE60",
+"&;	c #A1C388",
+"*;	c #BDD5AC",
+"=;	c #FBFDFB",
+"-;	c #D2E3C4",
+";;	c #ADCB93",
+">;	c #ADCB92",
+",;	c #CFE0BF",
+"';	c #C0D7AA",
+");	c #8EB765",
+"!;	c #76A845",
+"~;	c #9CC13E",
+"{;	c #9BC13E",
+"];	c #94BC39",
+"^;	c #84B12D",
+"/;	c #72A621",
+"(;	c #659D18",
+"_;	c #58950F",
+":;	c #4F8E08",
+"<;	c #4B8C05",
+"[;	c #4B8D03",
+"};	c #5C9818",
+"|;	c #6DA235",
+"1;	c #83B05A",
+"2;	c #A1C385",
+"3;	c #CBDEBD",
+"4;	c #EBF2E7",
+"5;	c #ADCA99",
+"6;	c #73A551",
+"7;	c #649C3F",
+"8;	c #7EAD5E",
+"9;	c #A5C58D",
+"0;	c #C3D9B2",
+"a;	c #E5EEDD",
+"b;	c #FCFDFC",
+"c;	c #CEE0BE",
+"d;	c #A6C78A",
+"e;	c #A5C688",
+"f;	c #C7DBB5",
+"g;	c #EEF5E9",
+"h;	c #BBD4A3",
+"i;	c #8BB561",
+"j;	c #74A643",
+"k;	c #A3C63F",
+"l;	c #9EC23B",
+"m;	c #93BB32",
+"n;	c #87B328",
+"o;	c #7DAD1F",
+"p;	c #73A717",
+"q;	c #6BA211",
+"r;	c #669F0D",
+"s;	c #649E0A",
+"t;	c #649E0D",
+"u;	c #69A019",
+"v;	c #6FA42F",
+"w;	c #7CAC4E",
+"x;	c #97BD78",
+"y;	c #C5DAB5",
+"z;	c #F1F6ED",
+"A;	c #ABC997",
+"B;	c #6FA24D",
+"C;	c #619A3C",
+"D;	c #7EAC5E",
+"E;	c #A6C790",
+"F;	c #C6DBB6",
+"G;	c #A7C78A",
+"H;	c #A3C585",
+"I;	c #C0D7AC",
+"J;	c #FBFCF9",
+"K;	c #F7FAF3",
+"L;	c #B3CE99",
+"M;	c #86B15C",
+"N;	c #70A43F",
+"O;	c #A6C83D",
+"P;	c #A3C63A",
+"Q;	c #9BC131",
+"R;	c #97BF2C",
+"S;	c #92BC27",
+"T;	c #8CB823",
+"U;	c #84B31D",
+"V;	c #7DAF1A",
+"W;	c #78AB20",
+"X;	c #72A62B",
+"Y;	c #74A640",
+"Z;	c #8CB569",
+"`;	c #BDD5AB",
+" >	c #EAF2E6",
+".>	c #A9C794",
+"+>	c #6CA049",
+"@>	c #5E9838",
+"#>	c #7DAC5D",
+"$>	c #A8C893",
+"%>	c #C8DCBA",
+"&>	c #AAC98F",
+"*>	c #B9D3A2",
+"=>	c #E4EEDB",
+"->	c #D1E1C1",
+";>	c #A8C78A",
+">>	c #7EAD54",
+",>	c #6BA03A",
+"'>	c #AACB40",
+")>	c #A9CA3D",
+"!>	c #A8CA3B",
+"~>	c #A6C937",
+"{>	c #A4C833",
+"]>	c #A1C62F",
+"^>	c #9BC32A",
+"/>	c #93BD24",
+"(>	c #8AB821",
+"_>	c #81B123",
+":>	c #72A727",
+"<>	c #6DA236",
+"[>	c #83AF5D",
+"}>	c #EAF1E4",
+"|>	c #A3C48E",
+"1>	c #639B3E",
+"2>	c #57932F",
+"3>	c #7BAA5B",
+"4>	c #CDE0C0",
+"5>	c #D3E3C4",
+"6>	c #ACCA91",
+"7>	c #A0C382",
+"8>	c #ACCA92",
+"9>	c #C5DAB3",
+"0>	c #CADEBA",
+"a>	c #C9DDB7",
+"b>	c #B9D2A2",
+"c>	c #97BC75",
+"d>	c #74A648",
+"e>	c #A7CA42",
+"f>	c #A5C93B",
+"g>	c #A3C837",
+"h>	c #A2C733",
+"i>	c #9FC62F",
+"j>	c #9BC32C",
+"k>	c #95C027",
+"l>	c #8EBB25",
+"m>	c #84B325",
+"n>	c #70A623",
+"o>	c #669E2D",
+"p>	c #7BAB54",
+"q>	c #B3CE9F",
+"r>	c #55922D",
+"s>	c #4A8B1F",
+"t>	c #77A856",
+"u>	c #B2CE9D",
+"v>	c #D6E5CA",
+"w>	c #F1F6EC",
+"x>	c #D5E4C7",
+"y>	c #AECC94",
+"z>	c #9BC07B",
+"A>	c #98BD77",
+"B>	c #98BD78",
+"C>	c #9BC07D",
+"D>	c #9CC07E",
+"E>	c #92BA71",
+"F>	c #659C37",
+"G>	c #5A9529",
+"H>	c #A4C843",
+"I>	c #9EC539",
+"J>	c #9BC331",
+"K>	c #9AC22E",
+"L>	c #97C02B",
+"M>	c #95BF29",
+"N>	c #90BD28",
+"O>	c #85B527",
+"P>	c #6EA420",
+"Q>	c #74A64C",
+"R>	c #AFCC99",
+"S>	c #ECF3E7",
+"T>	c #E7EFE1",
+"U>	c #93BA7A",
+"V>	c #48891D",
+"W>	c #3E8310",
+"X>	c #74A651",
+"Y>	c #B7D1A3",
+"Z>	c #F6F9F2",
+"`>	c #B0CD97",
+" ,	c #87B361",
+".,	c #7CAB52",
+"+,	c #76A84B",
+"@,	c #78A94E",
+"#,	c #7AAB52",
+"$,	c #74A74B",
+"%,	c #669E3A",
+"&,	c #589529",
+"*,	c #529021",
+"=,	c #A1C741",
+"-,	c #9EC53B",
+";,	c #97C02C",
+">,	c #96BF2B",
+",,	c #96C02A",
+"',	c #94BF2A",
+"),	c #87B627",
+"!,	c #6BA31C",
+"~,	c #59961C",
+"{,	c #6DA243",
+"],	c #ABCA95",
+"^,	c #E4EDDD",
+"/,	c #8EB773",
+"(,	c #418614",
+"_,	c #398009",
+":,	c #73A54F",
+"<,	c #BAD3A6",
+"[,	c #E2EDD7",
+"},	c #F9FBF5",
+"|,	c #D5E5C8",
+"1,	c #AFCC96",
+"2,	c #98BE77",
+"3,	c #8BB566",
+"4,	c #83B05C",
+"5,	c #7FAD57",
+"6,	c #81AF5B",
+"7,	c #83B05E",
+"8,	c #7CAC55",
+"9,	c #6BA141",
+"0,	c #5B962D",
+"a,	c #539123",
+"b,	c #9FC53D",
+"c,	c #9EC43B",
+"d,	c #9CC338",
+"e,	c #97C02D",
+"f,	c #96BF2A",
+"g,	c #96BF29",
+"h,	c #98C12A",
+"i,	c #97C12B",
+"j,	c #89B726",
+"k,	c #509010",
+"l,	c #659D39",
+"m,	c #AAC994",
+"n,	c #E2EDDC",
+"o,	c #8DB672",
+"p,	c #428614",
+"q,	c #3A810A",
+"r,	c #73A650",
+"s,	c #BBD4A7",
+"t,	c #F9FBF6",
+"u,	c #AACA8F",
+"v,	c #9DC17D",
+"w,	c #A4C587",
+"x,	c #B1CD98",
+"y,	c #BAD3A5",
+"z,	c #ABCA92",
+"A,	c #8CB66B",
+"B,	c #5E9830",
+"C,	c #9DC438",
+"D,	c #9CC336",
+"E,	c #9BC234",
+"F,	c #98C12D",
+"G,	c #95BE27",
+"H,	c #95BF27",
+"I,	c #99C22A",
+"J,	c #9AC22C",
+"K,	c #8BB826",
+"L,	c #669F10",
+"M,	c #4B8C08",
+"N,	c #609930",
+"O,	c #F2F6EE",
+"P,	c #DAE8D1",
+"Q,	c #8AB56D",
+"R,	c #448816",
+"S,	c #3E840D",
+"T,	c #76A852",
+"U,	c #BAD4A7",
+"V,	c #F8FBF5",
+"W,	c #A8C88C",
+"X,	c #A4C687",
+"Y,	c #FAFCF8",
+"Z,	c #DFEAD5",
+"`,	c #AFCC98",
+" '	c #80AF5B",
+".'	c #6AA03E",
+"+'	c #99C12F",
+"@'	c #94BE26",
+"#'	c #95BF26",
+"$'	c #9AC22B",
+"%'	c #9CC32E",
+"&'	c #8EBA28",
+"*'	c #6AA212",
+"='	c #4F8F08",
+"-'	c #5E9829",
+";'	c #EBF2E5",
+">'	c #EAF1E3",
+",'	c #E8F0E1",
+"''	c #E9F1E1",
+")'	c #C0D7AD",
+"!'	c #7EAD5A",
+"~'	c #458913",
+"{'	c #448812",
+"]'	c #7AAA55",
+"^'	c #BAD4A6",
+"/'	c #AFCC95",
+"('	c #8AB466",
+"_'	c #70A445",
+":'	c #95BF28",
+"<'	c #9CC330",
+"['	c #91BC2C",
+"}'	c #75A91C",
+"|'	c #5D9813",
+"1'	c #5F9923",
+"2'	c #7BAA4F",
+"3'	c #9ABF7D",
+"4'	c #A9C792",
+"5'	c #A9C891",
+"6'	c #A5C58A",
+"7'	c #A4C588",
+"8'	c #A4C489",
+"9'	c #A3C487",
+"0'	c #9FC180",
+"a'	c #8CB568",
+"b'	c #639C35",
+"c'	c #44880D",
+"d'	c #4D8E1A",
+"e'	c #81AF5C",
+"f'	c #BCD5A8",
+"g'	c #BCD5A7",
+"h'	c #DBE8CF",
+"i'	c #8CB66A",
+"j'	c #72A548",
+"k'	c #9BC436",
+"l'	c #9AC333",
+"m'	c #9AC22D",
+"n'	c #9CC332",
+"o'	c #94BE30",
+"p'	c #81B128",
+"q'	c #649D20",
+"r'	c #629B29",
+"s'	c #639B32",
+"t'	c #639B35",
+"u'	c #639B34",
+"v'	c #639B30",
+"w'	c #639B2F",
+"x'	c #639A2F",
+"y'	c #629A2F",
+"z'	c #629A2E",
+"A'	c #5D9726",
+"B'	c #4E8E12",
+"C'	c #468908",
+"D'	c #599522",
+"E'	c #87B360",
+"F'	c #BAD4A4",
+"G'	c #DBE9D0",
+"H'	c #CEDFBD",
+"I'	c #CDDFBD",
+"J'	c #E2ECD8",
+"K'	c #BED6AB",
+"L'	c #89B466",
+"M'	c #70A446",
+"N'	c #9CC438",
+"O'	c #9CC436",
+"P'	c #99C12D",
+"Q'	c #97C032",
+"R'	c #8AB72E",
+"S'	c #7CAE28",
+"T'	c #6FA522",
+"U'	c #629B1B",
+"V'	c #569414",
+"W'	c #50900F",
+"X'	c #508F0D",
+"Y'	c #52910B",
+"Z'	c #52910A",
+"`'	c #51900A",
+" )	c #508F0A",
+".)	c #518F0A",
+"+)	c #52900B",
+"@)	c #52910C",
+"#)	c #508F08",
+"$)	c #53910C",
+"%)	c #659D27",
+"&)	c #87B359",
+"*)	c #ACCB90",
+"=)	c #CBDEBA",
+"-)	c #F0F5EB",
+";)	c #DFEAD4",
+">)	c #B6D19F",
+",)	c #82B05C",
+"')	c #6AA13C",
+"))	c #98C12C",
+"!)	c #92BD32",
+"~)	c #8BB82F",
+"{)	c #83B32B",
+"])	c #7AAC24",
+"^)	c #72A61E",
+"/)	c #6DA319",
+"()	c #6DA317",
+"_)	c #6EA415",
+":)	c #6DA414",
+"<)	c #6DA314",
+"[)	c #6DA214",
+"})	c #6CA214",
+"|)	c #6BA214",
+"1)	c #6AA215",
+"2)	c #69A114",
+"3)	c #6BA218",
+"4)	c #72A629",
+"5)	c #7EAD45",
+"6)	c #ACCA93",
+"7)	c #D7E5CC",
+"8)	c #FBFCFB",
+"9)	c #DEEAD4",
+"0)	c #A9C88C",
+"a)	c #75A846",
+"b)	c #5D9925",
+"c)	c #96C034",
+"d)	c #96BF34",
+"e)	c #95BE32",
+"f)	c #94BD31",
+"g)	c #94BD2E",
+"h)	c #93BD2C",
+"i)	c #92BD2B",
+"j)	c #92BC2B",
+"k)	c #91BB2B",
+"l)	c #8FBA2A",
+"m)	c #8DB929",
+"n)	c #8AB728",
+"o)	c #87B526",
+"p)	c #84B326",
+"q)	c #7FAF2A",
+"r)	c #76A830",
+"s)	c #75A640",
+"t)	c #8DB569",
+"u)	c #C3D8B1",
+"v)	c #CCDEBB",
+"w)	c #99BF74",
+"x)	c #69A130",
+"y)	c #519210",
+"z)	c #94BE27",
+"A)	c #99C130",
+"B)	c #9DC436",
+"C)	c #A0C639",
+"D)	c #A4C83A",
+"E)	c #A4C839",
+"F)	c #A3C736",
+"G)	c #A1C733",
+"H)	c #A1C632",
+"I)	c #A1C633",
+"J)	c #A0C532",
+"K)	c #9DC431",
+"L)	c #9AC330",
+"M)	c #96C02E",
+"N)	c #93BD2D",
+"O)	c #89B62C",
+"P)	c #76A826",
+"Q)	c #6A9F2B",
+"R)	c #7AA94B",
+"S)	c #A9C78C",
+"T)	c #DAE7CD",
+"U)	c #DDE9D2",
+"V)	c #CCDEBC",
+"W)	c #B2CE96",
+"X)	c #8AB65B",
+"Y)	c #659F24",
+"Z)	c #529409",
+"`)	c #98C12E",
+" !	c #9BC435",
+".!	c #9DC538",
+"+!	c #9FC63A",
+"@!	c #A1C73B",
+"#!	c #A2C83C",
+"$!	c #A3C83A",
+"%!	c #A2C736",
+"&!	c #A0C632",
+"*!	c #9FC631",
+"=!	c #A0C533",
+"-!	c #9FC533",
+";!	c #99C22F",
+">!	c #9AC130",
+",!	c #91BB2E",
+"'!	c #7EAE27",
+")!	c #6EA325",
+"!!	c #71A434",
+"~!	c #85B156",
+"{!	c #9DC07B",
+"]!	c #B6D09F",
+"^!	c #BCD4A6",
+"/!	c #B9D3A4",
+"(!	c #A4C585",
+"_!	c #99BE75",
+":!	c #8CB65E",
+"<!	c #79AB3D",
+"[!	c #68A21F",
+"}!	c #609D10",
+"|!	c #98C02D",
+"1!	c #96C02B",
+"2!	c #97C12D",
+"3!	c #9DC539",
+"4!	c #9EC53A",
+"5!	c #9FC53B",
+"6!	c #9FC63C",
+"7!	c #99C22E",
+"8!	c #9AC22F",
+"9!	c #96C02F",
+"0!	c #9BC230",
+"a!	c #9DC331",
+"b!	c #97BF2F",
+"c!	c #87B42A",
+"d!	c #77A925",
+"e!	c #6CA224",
+"f!	c #659D25",
+"g!	c #629A29",
+"h!	c #669D35",
+"i!	c #75A649",
+"j!	c #86B261",
+"k!	c #80AE59",
+"l!	c #76A84C",
+"m!	c #71A543",
+"n!	c #6CA23A",
+"o!	c #69A031",
+"p!	c #68A029",
+"q!	c #6AA322",
+"r!	c #6DA61D",
+"s!	c #6FA71A",
+"t!	c #9CC538",
+"u!	c #9DC53A",
+"v!	c #9EC53C",
+"w!	c #9FC53C",
+"x!	c #9DC43A",
+"y!	c #99C131",
+"z!	c #98C131",
+"A!	c #95BF2E",
+"B!	c #9CC331",
+"C!	c #8CB72B",
+"D!	c #69A01B",
+"E!	c #55930D",
+"F!	c #458803",
+"G!	c #458809",
+"H!	c #569321",
+"I!	c #699F3A",
+"J!	c #6DA240",
+"K!	c #659D36",
+"L!	c #5A9627",
+"M!	c #529116",
+"N!	c #519110",
+"O!	c #579510",
+"P!	c #639E15",
+"Q!	c #70A71C",
+"R!	c #75AB1E",
+". . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 9 a b c d e f g h ",
+". . + @ i j k l m n o p > , q ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 r 9 a 8 7 d e f g h ",
+"s s t u v w x y z A B C D E F G H I J K ^ L M N O P Q R S T U V W X Y b Z r `  . . .r 9 ..+.h @.",
+"#.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.e 0.a.b.c.d.e.f.g.h.i.j.k.",
+"l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.0.U.V.W.X.Y.Z.`. +.+++@+#+",
+"$+%+&+*+=+-+;+;+;+>+,+'+)+!+~+{+B.]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+U.9+0+a+b+c+d+e+f+c+g+h+i+",
+"j+$+&+*+=+k+;+;+;+l+m+n+o+p+q+r+s+t+Y u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+8+9+J+K+L+M+d+N+O+P+Q+R+S+T+",
+"U+V+W+X+Y+Z+`+;+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@A+^@/@(@_@I+V.a.:@<@[@Z.P+}@|@1@2@3@4@5@",
+"U+6@7@8@9@0@a@;+b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@s@t@u@v@w@x@y@z@A@:@B@C@D@E@Z.P+F@G@|@H@I@J@K@",
+"L@M@7@8@9@0@a@;+b@c@d@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#U.=#-#;#>#Y.d+1@,#1@N+3@'#5@",
+"U+M@7@8@9@0@a@;+b@)#!#~#{#]#^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#=#B@<@d#c+e#O+f#g#h#i#j#",
+"k#l#W+m#n#0@a@;+b@o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#O#P#=#Q#R#Z.S#T#U#V#W#h+",
+"X#Y#Z#`#n#0@a@;+b@ $.$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${${$]$^$/$($_$:$<$[$}$|$Z 1$Q#2$3$4$5$6$7$",
+"8$9$0$a$b$0@a@;+a@c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$F$G$|$P#` H$4 I$J$k.",
+"K$L$M$N$b$0@a@;+a@O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%.@r.@%r.#%$%%%&%*%=%-%;%>%,%'%)%!%~%5 {%]%^%/%",
+"K$L$M$N$b$(%a@;+_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%d%e%f%g%h%i%j%k%l%m%k%n%o%p%J c#D@q%r%k./ ",
+"8$L$M$N$b$(%a@;+s%t%u%v%w%x%y%z%A%B%C%D%E%F%G%H%I%`+J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%{%`% &.&+&",
+"8$L$M$N$b$(%a@;+s%t%@&#&$&%&&&*&=&-&;&>&,&'&)&!&~&;+;+{&]&^&/&(&_&:&<&[&}&|&1&2&3&4&5&6&7&_.8&9&",
+"8$L$M$a$n#0@a@;+s%0&a&b&c&d&e&f&g&=&h&i&j&k&h&l&-&;+m&n&o&p&q&r&s&t&u&v&w&x&y&z&A&B&C&D&E&F&G&n@",
+"8$L$M$a$n#0@H&;+s%I&J&K&L&M&N&a% @O&P&)&Q&(%R&O&;+;+S&T&U&V&W&X&Y&Z&`& *.*+*@*#*$*%*&***=*-*;*>*",
+",*L$M$a$n#(%H&;+s%:%'*)*)*!*~*{*]*O&^*/*(*_*:*;+;+;+<*P&[*}*|*1*2*3*4*y 5*6*7*8*9*0*a*b*c*d*e*f*",
+"L$g*h*i*j*(%a@;+s%:%'*k*l*m*n*o*p*m&q*r*s*t*-&;+;+;+b@u*v*w*x*t#y*z*A*B*C*D*E*F*G*H*I*J*K*L*M*N*",
+"O*P*Q*R*Y+(%S*;+H&T*'*U*V*W*X*Y*a@Z*`* =.=+=<*;+;+;+@=W$#=$=%=&=*=Z$==-=d%;=>=c%,='=Q&)=!=~={=]=",
+"^=/=(=_=:=<=[=;+`+}=P$U*|=1=2=3=4=;+5=6=W$7=8=;+;+;+B%9=0=a=b=c=d=G*b%;+;+;+;+;+;+;+e=f=g=h=i=j=",
+"k=l=m=n=o=4%;+;+;+p=q=r=s=t=u=v=w=;+H&x=y=z=S&;+;+;+A=B=C=D=E=F=G=H=I=;+;+S*J=;+;+;+;+K=L=M=N=O=",
+"P=Q=R=S=T=k+;+;+;+U=V=r=W=X=Y=Z=c%;+O&n&>=a@`=;+;+;+ -.-+-@-#-$-%-&-*-;+=---;->-,-;+;+;+'-)-!-~-",
+"{-]-^-/-(-_-:-q*Z+<-[-}-|-1-2-3-4-;+;+ @`+5-=&;+;+;+6-7-e$8-$-9-0-a-]*O&b-c-d-e-[=;+;+;+R&n#f-g-",
+"h-i-j-k-l-m-n-o-p-q-r-s-t-u-v-w-c%;+;+x--&x-Z*;+;+;+y-z-A-B-C-D-E-F-J%G-H-p&I-J-K-;+;+;+H&L-M-N-",
+"O-O-P-Q-R-S-T-U-V-W-X-Y-Z-`- ;.; -;+;+;+=&m&;+;+;+;++;@;#;$;%;&;*;r.=;[=-;;;>;,;H&;+;+;+n&';);!;",
+"~;{;];^;/;(;_;:;<;[;j+};|;1;2;3; -;+;+;+;+;+;+;+;+;+4;5;6;7;8;9;0;a;b;S*c;d;e;f;g;;+;+;+^*h;i;j;",
+"k;k;l;m;n;o;p;q;r;s;t;u;v;w;x;y;z;;+;+;+;+;+;+;+;+;+b%A;B;C;D;E;F;@%x-S*,;G;H;I;h&B%J;K;(%L;M;N;",
+"M+M+O;P;H$Q;R;S;T;U;V;W;X;Y;Z;`;;=;+;+;+;+;+;+;+;+;+ >.>+>@>#>$>%>k+x-S*_-&>H;*> =!&t*=>->;>>>,>",
+"'>'>Z.)>!>~>{>]>^>/>(>_>:><>[>m+,=;+;+;+;+;+;+;+;+;+}>|>1>2>3>d$4>b%=&S*5>6>7>8>j$9>0>a>b>c>d>0*",
+"e>e>_@.+f>g>h>i>j>k>l>m>n>o>p>q>+;;+;+;+;+;+;+;+;+;+4%%-r>s>t>u>v>w>;+b@x>y>z>{$A>B>C>D>E>p>F>G>",
+"H>H>J$]%I>X J>K>L>M>N>O>P>+*Q>R>S>;+;+;+;+;+;+;+;+;+T>U>V>W>X>Y>;-Z>;+b@/*`>{$ ,.,+,@,#,$,%,&,*,",
+"=,=,>@-,u+U.8 ;,>,,,',),!,~,{,],+;;+;+;+;+;+;+;+;+;+^,/,(,_,:,<,[,},;+S*|,1,2,3,4,5,6,7,8,9,0,a,",
+"b,b,c,d,a.Z e,f,g,h,i,j,B&k,l,m,A=;+;+;+;+;+;+;+;+;+n,o,p,q,r,s,:-t,;+H&_-u,v,w,x,#=I-y,z,A,{,B,",
+"C,C,D,E,9 F,f,G,H,I,J,K,L,M,N,C=O,;+;+;+;+;+;+;+;+;+P,Q,R,S,T,U,Z+V,;+@=c;W,X,M%'=A=Y,s%Z,`, '.'",
+"D,D,8+=#+';,M>@'#'$'%'&'*'='-'B>v> -A=;'>'q*s.,'''(%)'!'~'{']'^'e-S*;+H&_-y>/'-;J;;+;+;+a@)'('_'",
+"D,D,8+=#+';,:'@'H,J,<'['}'|'1'2'3'4'5'6'7'-.8'9'9'0'a'b'c'd'e'f'e-H&;+[=6=g'j$h'`=;+;+;+ @G%i'j'",
+"+.+.k'l'+';,M>@'H,m'n'o'p'P>q'r's't'u'v'w'x'y'y'x'z'A'B'C'D'E'F'G'n&O&J;=>H'I'J'<*;+;+;+~&K'L'M'",
+"N'N'O'l'9 ;,M>@'H,P' .Q'R'S'T'U'V'W'X'Y'Z'`' ) ).)+)@)#)$)%)&)*)=)7=-&;+-););->--&;+;+;+s.>),)')",
+"N'N'O'l'9 ;,M>@'G,))r 0.!)~){)])^)/)()_):)<)[)})|)|)1)2)3)4)5)M-6)7);+;+;+S*Z>Z*;+;+;+8)9)0)a)b)",
+"N'N'O'l'9 ;,M>@'G,L>+'=#9+(.c)d)e)f)g)h)i)j)j)k)l)m)n)o)p)q)r)s)t)u)<*;+;+;+;+;+;+;+b;b%v)w)x)y)",
+"+.+.V.B@+';,M>@'z)L>A)-#B)W.C)W D)E)F)G)H)H)I)J)K)L)8 M)N)O)P)Q)R)S)T)n&s%n&z;O,z=_*U)V)W)X)Y)Z)",
+"V.8+C@c#`);,:'@'G,;,c# !.!+!@!#!7.$!%!&!*!&!=!-!K)0 ;!0 >!,!'!)!!!~!{!8>]!^!j$/!r$6>(!_!:!<![!}!",
+"a.a.B@A)|!1!:'@'H,2!l'+.3!4!5!6!6!I>X 0 7!8!r r Z 9!P#0!a!b!c!d!e!f!g!h!i!4,j!k!l!m!n!o!p!q!r!s!",
+"B@B@=#A)e,1!G,@':'2!T.t!u!-,v!w!v!x!C@8 F,8 y!z!9!A!M)B!J)>!C!])D!E!F!G!H!I!J!K!L!1*M!N!O!P!Q!R!"};

Added: trunk/deployment/cishell-installer/cishell_linux/libcairo-swt.so
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_linux/libcairo-swt.so
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_linux/plugins/org.eclipse.core.filesystem.linux.x86_1.0.0.v20060603.jar
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_linux/plugins/org.eclipse.core.filesystem.linux.x86_1.0.0.v20060603.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_linux/plugins/org.eclipse.swt.gtk.linux.x86_3.2.0.v3232m.jar
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_linux/plugins/org.eclipse.swt.gtk.linux.x86_3.2.0.v3232m.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_macosx/plugins/org.eclipse.core.filesystem.macosx_1.0.0.v20060603.jar
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_macosx/plugins/org.eclipse.core.filesystem.macosx_1.0.0.v20060603.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_macosx/plugins/org.eclipse.swt.carbon.macosx_3.2.0.v3232m.jar
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_macosx/plugins/org.eclipse.swt.carbon.macosx_3.2.0.v3232m.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Info.plist
===================================================================
--- trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Info.plist	                        (rev 0)
+++ trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Info.plist	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+
+<dict>
+	<key>CFBundleExecutable</key>
+		<string>cishell</string>
+	<key>CFBundleGetInfoString</key>
+		<string>Eclipse 3.2 for Mac OS X, Copyright IBM Corp. and others 2002, 2006. All rights reserved.</string>
+	<key>CFBundleIconFile</key>
+		<string>cishell.icns</string>
+	<key>CFBundleIdentifier</key>
+		<string>org.eclipse.eclipse</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+	<key>CFBundleName</key>
+		<string>cishell</string>
+	<key>CFBundlePackageType</key>
+		<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+		<string>3.2</string>
+	<key>CFBundleSignature</key>
+		<string>????</string>
+	<key>CFBundleVersion</key>
+		<string>3.2</string>
+		
+	<key>LSBackgroundOnly</key><string>1</string>
+		
+	<key>Eclipse</key>
+		<array>
+			<!-- to use a specific Java version (instead of the platform's default) uncomment one of the following options:
+				<string>-vm</string><string>/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Commands/java</string>
+				<string>-vm</string><string>/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Commands/java</string>
+			-->
+			<string>-startup</string><string>../../../startup.jar</string>
+			<string>-keyring</string><string>~/.eclipse_keyring</string>
+			<string>-consoleLog</string>
+			<string>-showlocation</string>
+			<!-- WARNING:
+				If you try to add a single VM argument (-vmargs) here,
+				*all* vmargs specified in eclipse.ini will be ignored.
+				We recommend to add all arguments in eclipse.ini
+			 -->
+		</array>
+</dict>
+
+</plist>

Added: trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/MacOS/cishell
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/MacOS/cishell
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/MacOS/cishell.ini
===================================================================
--- trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/MacOS/cishell.ini	                        (rev 0)
+++ trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/MacOS/cishell.ini	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,8 @@
+-vmargs
+-Xdock:icon=../Resources/cishell.icns
+-XstartOnFirstThread
+-Xbootclasspath/p:../../../plugins/org.eclipse.jdt.debug_3.2.0.v20060605/jdi.jar
+-Xms40m
+-Xmx256m
+-Dorg.eclipse.swt.internal.carbon.smallFonts
+-Dorg.eclipse.swt.internal.carbon.noFocusRing
\ No newline at end of file

Added: trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/Splash.app/Contents/Info.plist
===================================================================
--- trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/Splash.app/Contents/Info.plist	                        (rev 0)
+++ trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/Splash.app/Contents/Info.plist	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+
+<dict>
+	<key>CFBundleExecutable</key>
+		<string>cishell</string>
+	<key>CFBundleGetInfoString</key>
+		<string>Eclipse 3.2 for Mac OS X, Copyright IBM Corp. and others 2002, 2006. All rights reserved.</string>
+	<key>CFBundleIdentifier</key>
+		<string>org.eclipse.eclipse</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+	<key>CFBundleName</key>
+		<string>cishell</string>
+	<key>CFBundlePackageType</key>
+		<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+		<string>3.2</string>
+	<key>CFBundleSignature</key>
+		<string>????</string>
+	<key>CFBundleVersion</key>
+		<string>3.2</string>
+	<key>LSUIElement</key>
+		<string>1</string>
+</dict>
+
+</plist>

Added: trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/Splash.app/Contents/MacOS/cishell
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/Splash.app/Contents/MacOS/cishell
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/cishell.icns
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_macosx_ppc/CIShell.app/Contents/Resources/cishell.icns
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Info.plist
===================================================================
--- trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Info.plist	                        (rev 0)
+++ trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Info.plist	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+
+<dict>
+	<key>CFBundleExecutable</key>
+		<string>cishell</string>
+	<key>CFBundleGetInfoString</key>
+		<string>Eclipse 3.2 for Mac OS X, Copyright IBM Corp. and others 2002, 2006. All rights reserved.</string>
+	<key>CFBundleIconFile</key>
+		<string>cishell.icns</string>
+	<key>CFBundleIdentifier</key>
+		<string>org.eclipse.eclipse</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+	<key>CFBundleName</key>
+		<string>cishell</string>
+	<key>CFBundlePackageType</key>
+		<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+		<string>3.2</string>
+	<key>CFBundleSignature</key>
+		<string>????</string>
+	<key>CFBundleVersion</key>
+		<string>3.2</string>
+		
+	<key>LSBackgroundOnly</key><string>1</string>
+		
+	<key>Eclipse</key>
+		<array>
+			<!-- to use a specific Java version (instead of the platform's default) uncomment one of the following options:
+				<string>-vm</string><string>/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Commands/java</string>
+				<string>-vm</string><string>/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Commands/java</string>
+			-->
+			<string>-startup</string><string>../../../startup.jar</string>
+			<string>-keyring</string><string>~/.eclipse_keyring</string>
+			<string>-consoleLog</string>
+			<string>-showlocation</string>
+			<!-- WARNING:
+				If you try to add a single VM argument (-vmargs) here,
+				*all* vmargs specified in eclipse.ini will be ignored.
+				We recommend to add all arguments in eclipse.ini
+			 -->
+		</array>
+</dict>
+
+</plist>

Added: trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/MacOS/cishell
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/MacOS/cishell
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/MacOS/cishell.ini
===================================================================
--- trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/MacOS/cishell.ini	                        (rev 0)
+++ trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/MacOS/cishell.ini	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,8 @@
+-vmargs
+-Xdock:icon=../Resources/cishell.icns
+-XstartOnFirstThread
+-Xbootclasspath/p:../../../plugins/org.eclipse.jdt.debug_3.2.0.@qualifier@/jdi.jar
+-Xms40m
+-Xmx256m
+-Dorg.eclipse.swt.internal.carbon.smallFonts
+-Dorg.eclipse.swt.internal.carbon.noFocusRing
\ No newline at end of file

Added: trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/Splash.app/Contents/Info.plist
===================================================================
--- trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/Splash.app/Contents/Info.plist	                        (rev 0)
+++ trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/Splash.app/Contents/Info.plist	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+
+<dict>
+	<key>CFBundleExecutable</key>
+		<string>cishell</string>
+	<key>CFBundleGetInfoString</key>
+		<string>Eclipse 3.2 for Mac OS X, Copyright IBM Corp. and others 2002, 2006. All rights reserved.</string>
+	<key>CFBundleIdentifier</key>
+		<string>org.eclipse.eclipse</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+	<key>CFBundleName</key>
+		<string>cishell</string>
+	<key>CFBundlePackageType</key>
+		<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+		<string>3.2</string>
+	<key>CFBundleSignature</key>
+		<string>????</string>
+	<key>CFBundleVersion</key>
+		<string>3.2</string>
+	<key>LSUIElement</key>
+		<string>1</string>
+</dict>
+
+</plist>

Added: trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/Splash.app/Contents/MacOS/cishell
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/Splash.app/Contents/MacOS/cishell
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/cishell.icns
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_macosx_x86/CIShell.app/Contents/Resources/cishell.icns
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_win32/cishell.exe
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_win32/cishell.exe
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_win32/cishell.ico
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_win32/cishell.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_win32/plugins/org.eclipse.core.filesystem.win32.x86_1.0.0.v20060603.jar
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_win32/plugins/org.eclipse.core.filesystem.win32.x86_1.0.0.v20060603.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_win32/plugins/org.eclipse.swt.win32.win32.x86_3.2.0.v3232m.jar
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_win32/plugins/org.eclipse.swt.win32.win32.x86_3.2.0.v3232m.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/cishell_win32/plugins/org.eclipse.update.core.win32_3.2.0.v20060605.jar
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/cishell_win32/plugins/org.eclipse.update.core.win32_3.2.0.v20060605.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/config.ini
===================================================================
--- trunk/deployment/cishell-installer/config.ini	                        (rev 0)
+++ trunk/deployment/cishell-installer/config.ini	2006-09-14 20:43:46 UTC (rev 196)
@@ -0,0 +1,6 @@
+#Product Runtime Configuration File
+
+osgi.splashPath=platform:/base/plugins/org.cishell.reference.gui.brand.cishell
+eclipse.product=org.cishell.reference.gui.brand.cishell.cishell
+osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.update.configurator@3:start,org.eclipse.core.runtime@start,org.eclipse.equinox.ds@3:start,org.eclipse.equinox.log@3:start,org.eclipse.equinox.metatype@3:start,org.eclipse.equinox.event@3:start,org.cishell.service.autostart@4:start
+osgi.bundles.defaultStartLevel=4

Added: trunk/deployment/cishell-installer/icons/cishell.icns
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/icons/cishell.icns
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/icons/cishell.ico
===================================================================
(Binary files differ)


Property changes on: trunk/deployment/cishell-installer/icons/cishell.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/deployment/cishell-installer/icons/cishell.xpm
===================================================================
--- trunk/deployment/cishell-installer/icons/cishell.xpm	                        (rev 0)
+++ trunk/deployment/cishell-installer/icons/cishe...
 
[truncated message content]

[CIShell-SVN] SF.net SVN: cishell: [195] trunk/deployment/cishell-installer/

From: <bh...@us...> - 2006-09-14 20:41:04

Revision: 195
          http://svn.sourceforge.net/cishell/?rev=195&view=rev
Author:   bh2
Date:     2006-09-14 13:40:55 -0700 (Thu, 14 Sep 2006)

Log Message:
-----------
Initial import.

Added Paths:
-----------
    trunk/deployment/cishell-installer/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [194] trunk/clients/gui/org.cishell.reference.gui. guibuilder.temp/src/org/cishell/reference/gui/guibuilder/temp/GUIImpl.java

From: <bh...@us...> - 2006-09-14 19:27:51

Revision: 194
          http://svn.sourceforge.net/cishell/?rev=194&view=rev
Author:   bh2
Date:     2006-09-14 12:27:48 -0700 (Thu, 14 Sep 2006)

Log Message:
-----------
fixed a bug in gui builder where an algorithm w/ no OCD in its metadata.xml
uses NULLObject design pattern for flexibility

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.guibuilder.temp/src/org/cishell/reference/gui/guibuilder/temp/GUIImpl.java

Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.temp/src/org/cishell/reference/gui/guibuilder/temp/GUIImpl.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.temp/src/org/cishell/reference/gui/guibuilder/temp/GUIImpl.java	2006-09-14 15:03:31 UTC (rev 193)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.temp/src/org/cishell/reference/gui/guibuilder/temp/GUIImpl.java	2006-09-14 19:27:48 UTC (rev 194)
@@ -14,6 +14,7 @@
 package org.cishell.reference.gui.guibuilder.temp;
 
 import java.util.Dictionary;
+import java.util.Hashtable;
 
 import org.cishell.service.guibuilder.GUI;
 import org.cishell.service.guibuilder.SelectionListener;
@@ -27,24 +28,28 @@
  * 
  * @author Bruce Herr (bh...@bh...)
  */
-public class GUIImpl implements GUI {
+public class GUIImpl implements GUI {	
     boolean closed;
     GUIBuilder builder;
     ParameterMapAdapter pmap;
 
     public GUIImpl(String id, MetaTypeProvider provider) {
         pmap = new ParameterMapAdapter(provider, id);
-        final String title = pmap.getObjectClassDefinition().getName();
-        final String message = pmap.getObjectClassDefinition().getDescription();
-                
-        GUIBuilder.setGUIBuilder(SwtGUIBuilder.getGUIBuilder());
         
-        PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
-            public void run() {
-                builder = GUIBuilder.createGUI(title, message, pmap);
-            }});
-        
-        closed = false;
+        if (provider != null && pmap.getObjectClassDefinition() != null) {
+	        final String title = pmap.getObjectClassDefinition().getName();
+	        final String message = pmap.getObjectClassDefinition().getDescription();
+	                
+	        GUIBuilder.setGUIBuilder(SwtGUIBuilder.getGUIBuilder());
+	        
+	        PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
+	            public void run() {
+	                builder = GUIBuilder.createGUI(title, message, pmap);
+	            }});
+	        closed = false;
+        } else {
+        	builder = GUIBuilder.NULL_BUILDER;
+        }
     }
 
     /**
@@ -66,31 +71,35 @@
      * @see org.cishell.service.guibuilder.GUI#open()
      */
     public void open() {
-        builder.open();
+		builder.open();
     }
 
     /**
      * @see org.cishell.service.guibuilder.GUI#openAndWait()
      */
     public synchronized Dictionary openAndWait() {
-        final WaitingSelectionListener listener = new WaitingSelectionListener();
-        
-        PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-            public void run() {
-                open();
-                
-                setSelectionListener(listener);
-            }});
-        
-        while (!listener.gotResult) {
-            try {
-                wait(500);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-        
-        return listener.result;
+    	if (builder != GUIBuilder.NULL_BUILDER) {
+		    final WaitingSelectionListener listener = new WaitingSelectionListener();
+		    
+		    PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
+		        public void run() {
+		            open();
+		            
+		            setSelectionListener(listener);
+		        }});
+		    
+		    while (!listener.gotResult) {
+		        try {
+		            wait(500);
+		        } catch (InterruptedException e) {
+		            e.printStackTrace();
+		        }
+		    }
+		    
+		    return listener.result;
+    	} else {
+    		return new Hashtable();
+    	}
     }
     
     private class WaitingSelectionListener implements SelectionListener {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [193] trunk/deployment

From: <bh...@us...> - 2006-09-14 15:03:52

Revision: 193
          http://svn.sourceforge.net/cishell/?rev=193&view=rev
Author:   bh2
Date:     2006-09-14 08:03:31 -0700 (Thu, 14 Sep 2006)

Log Message:
-----------
added new features for the update site

Added Paths:
-----------
    trunk/deployment/org.cishell.algorithm.examples.feature/.project
    trunk/deployment/org.cishell.algorithm.examples.feature/build.properties
    trunk/deployment/org.cishell.algorithm.examples.feature/feature.xml
    trunk/deployment/org.cishell.environment.equinox.feature/.project
    trunk/deployment/org.cishell.environment.equinox.feature/build.properties
    trunk/deployment/org.cishell.environment.equinox.feature/feature.xml
    trunk/deployment/org.cishell.reference.feature/.project
    trunk/deployment/org.cishell.reference.feature/build.properties
    trunk/deployment/org.cishell.reference.feature/feature.xml
    trunk/deployment/org.cishell.reference.gui.feature/.project
    trunk/deployment/org.cishell.reference.gui.feature/build.properties
    trunk/deployment/org.cishell.reference.gui.feature/feature.xml

Added: trunk/deployment/org.cishell.algorithm.examples.feature/.project
===================================================================
--- trunk/deployment/org.cishell.algorithm.examples.feature/.project	                        (rev 0)
+++ trunk/deployment/org.cishell.algorithm.examples.feature/.project	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.cishell.algorithm.examples.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

Added: trunk/deployment/org.cishell.algorithm.examples.feature/build.properties
===================================================================
--- trunk/deployment/org.cishell.algorithm.examples.feature/build.properties	                        (rev 0)
+++ trunk/deployment/org.cishell.algorithm.examples.feature/build.properties	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1 @@
+bin.includes = feature.xml

Added: trunk/deployment/org.cishell.algorithm.examples.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.algorithm.examples.feature/feature.xml	                        (rev 0)
+++ trunk/deployment/org.cishell.algorithm.examples.feature/feature.xml	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.cishell.algorithm.examples.feature"
+      label="CIShell Sample Algorithms"
+      version="0.0.1.qualifier">
+
+   <description>
+      Example algorithms for development and testing of CIShell.
+   </description>
+
+   <copyright>
+      Copyright 2006 Indiana University
+   </copyright>
+
+   <license url="http://www.apache.org/licenses/LICENSE-2.0">
+      CIShell: Cyberinfrastructure Shell
+Copyright 2006 Indiana University
+Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at:
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, 
+software distributed under the License is distributed on an 
+&quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
+KIND, either express or implied. See the License for the specific
+language governing permissions and limitations under the License.
+Project Contacts:
+Bruce Herr (bh...@bh...)
+Weixia Huang (hu...@in...)
+Shashikant Penumarthy (sp...@in...)
+Dr. Katy Borner (ka...@in...)
+   </license>
+
+   <url>
+      <update label="CIShell Update Site" url="http://cishell.org/update"/>
+      <discovery label="CIShell Update Site" url="http://cishell.org/update"/>      
+   </url>
+
+   <plugin
+         id="org.cishell.tests.conversion1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

Added: trunk/deployment/org.cishell.environment.equinox.feature/.project
===================================================================
--- trunk/deployment/org.cishell.environment.equinox.feature/.project	                        (rev 0)
+++ trunk/deployment/org.cishell.environment.equinox.feature/.project	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.cishell.environment.equinox.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

Added: trunk/deployment/org.cishell.environment.equinox.feature/build.properties
===================================================================
--- trunk/deployment/org.cishell.environment.equinox.feature/build.properties	                        (rev 0)
+++ trunk/deployment/org.cishell.environment.equinox.feature/build.properties	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1 @@
+bin.includes = feature.xml

Added: trunk/deployment/org.cishell.environment.equinox.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.environment.equinox.feature/feature.xml	                        (rev 0)
+++ trunk/deployment/org.cishell.environment.equinox.feature/feature.xml	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.cishell.environment.equinox.feature"
+      label="CIShell Equinox Execution Environment"
+      version="0.0.1">
+
+   <description url="http://cishell.org">
+      CIShell OSGi Environment (Eclipse Equinox)
+   </description>
+
+   <copyright>
+      Copyright 2006 Indiana University
+   </copyright>
+
+   <license url="http://www.apache.org/licenses/LICENSE-2.0">
+      CIShell: Cyberinfrastructure Shell
+Copyright 2006 Indiana University
+Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at:
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, 
+software distributed under the License is distributed on an 
+&quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
+KIND, either express or implied. See the License for the specific
+language governing permissions and limitations under the License.
+Project Contacts:
+Bruce Herr (bh...@bh...)
+Weixia Huang (hu...@in...)
+Shashikant Penumarthy (sp...@in...)
+Dr. Katy Borner (ka...@in...)
+   </license>
+
+   <url>
+      <update label="CIShell Update Site" url="http://cishell.org/update"/>
+      <discovery label="CIShell Update Site" url="http://cishell.org/update"/>
+   </url>
+
+   <plugin
+         id="org.apache.xerces"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="com.ibm.icu"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.commands"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.contenttype"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.expressions"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.jobs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.runtime.compatibility.auth"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.runtime.compatibility.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"/>
+
+   <plugin
+         id="org.eclipse.equinox.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.ds"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.event"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.log"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.metatype"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.preferences"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.useradmin"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.help"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jface"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi.services"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.carbon.macosx"
+         os="macosx"
+         ws="carbon"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.gtk.linux.ppc"
+         os="linux"
+         ws="gtk"
+         arch="ppc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.gtk.linux.x86"
+         os="linux"
+         ws="gtk"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.gtk.linux.x86_64"
+         os="linux"
+         ws="gtk"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.gtk.solaris.sparc"
+         os="solaris"
+         ws="gtk"
+         arch="sparc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.motif.aix.ppc"
+         os="aix"
+         ws="motif"
+         arch="ppc"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.motif.hpux.PA_RISC"
+         os="hpux"
+         ws="motif"
+         arch="PA_RISC"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.motif.linux.x86"
+         os="linux"
+         ws="motif"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.swt.win32.win32.x86"
+         os="win32"
+         ws="win32"
+         arch="x86"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.carbon"
+         ws="carbon"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.workbench"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.configurator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.core.linux"
+         os="linux"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.core.win32"
+         os="win32"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.update.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ui.forms"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

Added: trunk/deployment/org.cishell.reference.feature/.project
===================================================================
--- trunk/deployment/org.cishell.reference.feature/.project	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.feature/.project	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.cishell.reference.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

Added: trunk/deployment/org.cishell.reference.feature/build.properties
===================================================================
--- trunk/deployment/org.cishell.reference.feature/build.properties	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.feature/build.properties	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1 @@
+bin.includes = feature.xml

Added: trunk/deployment/org.cishell.reference.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.reference.feature/feature.xml	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.feature/feature.xml	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.cishell.reference.feature"
+      label="CIShell Reference Bundles"
+      version="0.0.1.qualifier">
+
+   <description url="http://cishell.org">
+      CIShell Reference Bundles
+   </description>
+
+   <copyright>
+      Copyright 2006 Indiana University
+   </copyright>
+
+   <license url="http://www.apache.org/licenses/LICENSE-2.0">
+      CIShell: Cyberinfrastructure Shell
+Copyright 2006 Indiana University
+Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at:
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, 
+software distributed under the License is distributed on an 
+&quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
+KIND, either express or implied. See the License for the specific
+language governing permissions and limitations under the License.
+Project Contacts:
+Bruce Herr (bh...@bh...)
+Weixia Huang (hu...@in...)
+Shashikant Penumarthy (sp...@in...)
+Dr. Katy Borner (ka...@in...)
+   </license>
+
+   <url>
+      <update label="CIShell Update Site" url="http://cishell.org/update"/>
+      <discovery label="CIShell Update Site" url="http://cishell.org/update"/>      
+   </url>
+
+   <plugin
+         id="org.cishell.reference"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.cishell.reference.services"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.cishell.service.autostart"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

Added: trunk/deployment/org.cishell.reference.gui.feature/.project
===================================================================
--- trunk/deployment/org.cishell.reference.gui.feature/.project	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.gui.feature/.project	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.cishell.reference.gui.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

Added: trunk/deployment/org.cishell.reference.gui.feature/build.properties
===================================================================
--- trunk/deployment/org.cishell.reference.gui.feature/build.properties	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.gui.feature/build.properties	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1 @@
+bin.includes = feature.xml

Added: trunk/deployment/org.cishell.reference.gui.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.reference.gui.feature/feature.xml	                        (rev 0)
+++ trunk/deployment/org.cishell.reference.gui.feature/feature.xml	2006-09-14 15:03:31 UTC (rev 193)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.cishell.reference.gui.feature"
+      label="CIShell Reference GUI"
+      version="0.0.1.qualifier">
+
+   <description url="http://cishell.org">
+      CIShell Reference GUI
+   </description>
+
+   <copyright>
+      Copyright 2006 Indiana University
+   </copyright>
+
+   <license url="http://www.apache.org/licenses/LICENSE-2.0">
+      CIShell: Cyberinfrastructure Shell
+Copyright 2006 Indiana University
+Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at:
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, 
+software distributed under the License is distributed on an 
+&quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
+KIND, either express or implied. See the License for the specific
+language governing permissions and limitations under the License.
+Project Contacts:
+Bruce Herr (bh...@bh...)
+Weixia Huang (hu...@in...)
+Shashikant Penumarthy (sp...@in...)
+Dr. Katy Borner (ka...@in...)
+   </license>
+
+   <url>
+      <update label="CIShell Update Site" url="http://cishell.org/update"/>
+      <discovery label="CIShell Update Site" url="http://cishell.org/update"/>
+   </url>
+
+   <plugin
+         id="org.cishell.reference.gui.brand.cishell"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.cishell.reference.gui.datamanager"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.cishell.reference.gui.guibuilder.temp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.cishell.reference.gui.log"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.cishell.reference.gui.menumanager"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.cishell.reference.gui.workspace"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="edu.iu.iv.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="edu.iu.iv.swtguibuilder"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [192] trunk/deployment/org.cishell.algorithm.examples. feature/

From: <bh...@us...> - 2006-09-14 14:39:03

Revision: 192
          http://svn.sourceforge.net/cishell/?rev=192&view=rev
Author:   bh2
Date:     2006-09-14 07:38:58 -0700 (Thu, 14 Sep 2006)

Log Message:
-----------
Initial import.

Added Paths:
-----------
    trunk/deployment/org.cishell.algorithm.examples.feature/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [191] trunk/deployment/org.cishell.reference.gui. feature/

From: <bh...@us...> - 2006-09-14 14:38:18

Revision: 191
          http://svn.sourceforge.net/cishell/?rev=191&view=rev
Author:   bh2
Date:     2006-09-14 07:38:09 -0700 (Thu, 14 Sep 2006)

Log Message:
-----------
Initial import.

Added Paths:
-----------
    trunk/deployment/org.cishell.reference.gui.feature/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [190] trunk/deployment/org.cishell.reference.feature/

From: <bh...@us...> - 2006-09-14 14:37:30

Revision: 190
          http://svn.sourceforge.net/cishell/?rev=190&view=rev
Author:   bh2
Date:     2006-09-14 07:37:24 -0700 (Thu, 14 Sep 2006)

Log Message:
-----------
Initial import.

Added Paths:
-----------
    trunk/deployment/org.cishell.reference.feature/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [189] trunk/deployment/org.cishell.environment.equinox .feature/

From: <bh...@us...> - 2006-09-14 14:36:27

Revision: 189
          http://svn.sourceforge.net/cishell/?rev=189&view=rev
Author:   bh2
Date:     2006-09-14 07:36:21 -0700 (Thu, 14 Sep 2006)

Log Message:
-----------
Initial import.

Added Paths:
-----------
    trunk/deployment/org.cishell.environment.equinox.feature/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [188] trunk/deployment

From: <bh...@us...> - 2006-09-14 14:35:40

Revision: 188
          http://svn.sourceforge.net/cishell/?rev=188&view=rev
Author:   bh2
Date:     2006-09-14 07:35:32 -0700 (Thu, 14 Sep 2006)

Log Message:
-----------
* redid current features and updated update site
* now the update site is fully ready to serve updates 
to the actual cishell applications

Modified Paths:
--------------
    trunk/deployment/org.cishell.development.feature/feature.xml
    trunk/deployment/org.cishell.feature/feature.xml
    trunk/deployment/org.cishell.update/site.xml

Modified: trunk/deployment/org.cishell.development.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.development.feature/feature.xml	2006-09-13 20:53:13 UTC (rev 187)
+++ trunk/deployment/org.cishell.development.feature/feature.xml	2006-09-14 14:35:32 UTC (rev 188)
@@ -2,19 +2,19 @@
 <feature
       id="org.cishell.development.feature"
       label="CIShell Algorithm Development Plug-In"
-      version="0.0.1">
+      version="0.0.1.qualifier">
 
    <description url="http://cishell.org">
       The CIShell Algorithm Development Pack
    </description>
 
-   <copyright url="http://www.copyright.iupui.edu/">
-      Copyright 2005 The Trustees of Indiana University
+   <copyright>
+      Copyright 2006 Indiana University
    </copyright>
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0">
       CIShell: Cyberinfrastructure Shell
-Copyright 2005 Indiana University
+Copyright 2006 Indiana University
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at:

Modified: trunk/deployment/org.cishell.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.feature/feature.xml	2006-09-13 20:53:13 UTC (rev 187)
+++ trunk/deployment/org.cishell.feature/feature.xml	2006-09-14 14:35:32 UTC (rev 188)
@@ -1,27 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.cishell.feature"
-      label="CIShell Installation Feature"
-      version="0.0.1">
+      label="CIShell Framework API Feature"
+      version="0.0.1.qualifier">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description url="http://cishell.org">
+      CIShell Framework API
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+   <copyright>
+      Copyright 2006 Indiana University
    </copyright>
 
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
+   <license url="http://www.apache.org/licenses/LICENSE-2.0">
+      CIShell: Cyberinfrastructure Shell
+Copyright 2006 Indiana University
+Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at:
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, 
+software distributed under the License is distributed on an 
+&quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
+KIND, either express or implied. See the License for the specific
+language governing permissions and limitations under the License.
+Project Contacts:
+Bruce Herr (bh...@bh...)
+Weixia Huang (hu...@in...)
+Shashikant Penumarthy (sp...@in...)
+Dr. Katy Borner (ka...@in...)
    </license>
 
-   <plugin
-         id="org.cishell.compatibility"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <url>
+      <update label="CIShell Update Site" url="http://cishell.org/update"/>
+      <discovery label="CIShell Update Site" url="http://cishell.org/update"/>
+   </url>
 
    <plugin
          id="org.cishell.framework"
@@ -30,18 +43,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.cishell.reference"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.cishell.service.autostart"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>

Modified: trunk/deployment/org.cishell.update/site.xml
===================================================================
--- trunk/deployment/org.cishell.update/site.xml	2006-09-13 20:53:13 UTC (rev 187)
+++ trunk/deployment/org.cishell.update/site.xml	2006-09-14 14:35:32 UTC (rev 188)
@@ -3,8 +3,29 @@
    <description url="http://cishell.org/update">
       Update site for CIShell: Cyberinfrastructure Shell
    </description>
-   <feature url="features/org.cishell.development.feature_0.0.1.jar" id="org.cishell.development.feature" version="0.0.1">
+   <feature url="features/org.cishell.feature_0.0.1.200609131643.jar" id="org.cishell.feature" version="0.0.1.200609131643">
+      <category name="Core Features"/>
+   </feature>
+   <feature url="features/org.cishell.reference.gui.feature_0.0.1.200609131643.jar" id="org.cishell.reference.gui.feature" version="0.0.1.200609131643">
+      <category name="Applications"/>
+   </feature>
+   <feature url="features/org.cishell.environment.equinox.feature_0.0.1.jar" id="org.cishell.environment.equinox.feature" version="0.0.1">
+      <category name="Core Features"/>
+   </feature>
+   <feature url="features/org.cishell.reference.feature_0.0.1.200609131643.jar" id="org.cishell.reference.feature" version="0.0.1.200609131643">
+      <category name="Core Features"/>
+   </feature>
+   <feature url="features/org.cishell.algorithm.examples.feature_0.0.1.200609131643.jar" id="org.cishell.algorithm.examples.feature" version="0.0.1.200609131643">
       <category name="Development"/>
    </feature>
+   <feature url="features/org.cishell.development.feature_0.0.1.200609131643.jar" id="org.cishell.development.feature" version="0.0.1.200609131643">
+      <category name="Development"/>
+   </feature>
    <category-def name="Development" label="Development"/>
+   <category-def name="Applications" label="Applications">
+      <description>
+         CIShell Reference Applications
+      </description>
+   </category-def>
+   <category-def name="Core Features" label="Core Features"/>
 </site>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [187] trunk

From: <bh...@us...> - 2006-09-13 20:53:19

Revision: 187
          http://svn.sourceforge.net/cishell/?rev=187&view=rev
Author:   bh2
Date:     2006-09-13 13:53:13 -0700 (Wed, 13 Sep 2006)

Log Message:
-----------
moving features to the deployment dir

Added Paths:
-----------
    trunk/deployment/org.cishell.feature/

Removed Paths:
-------------
    trunk/core/org.cishell.feature/

Copied: trunk/deployment/org.cishell.feature (from rev 186, trunk/core/org.cishell.feature)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [186] trunk

From: <bh...@us...> - 2006-09-13 20:52:44

Revision: 186
          http://svn.sourceforge.net/cishell/?rev=186&view=rev
Author:   bh2
Date:     2006-09-13 13:52:37 -0700 (Wed, 13 Sep 2006)

Log Message:
-----------
moving update site to the deployment dir

Added Paths:
-----------
    trunk/deployment/org.cishell.update/

Removed Paths:
-------------
    trunk/core/org.cishell.update/

Copied: trunk/deployment/org.cishell.update (from rev 185, trunk/core/org.cishell.update)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [185] trunk

From: <bh...@us...> - 2006-09-13 20:52:00

Revision: 185
          http://svn.sourceforge.net/cishell/?rev=185&view=rev
Author:   bh2
Date:     2006-09-13 13:51:52 -0700 (Wed, 13 Sep 2006)

Log Message:
-----------
moving features to the deployment dir

Added Paths:
-----------
    trunk/deployment/org.cishell.development.feature/

Removed Paths:
-------------
    trunk/core/org.cishell.development.feature/

Copied: trunk/deployment/org.cishell.development.feature (from rev 184, trunk/core/org.cishell.development.feature)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [184] trunk/deployment/

From: <bh...@us...> - 2006-09-13 20:51:01

Revision: 184
          http://svn.sourceforge.net/cishell/?rev=184&view=rev
Author:   bh2
Date:     2006-09-13 13:50:57 -0700 (Wed, 13 Sep 2006)

Log Message:
-----------
added deployment dir for deployment specific projects

Added Paths:
-----------
    trunk/deployment/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [183] trunk/clients/gui/org.cishell.reference.gui.log/ src/org/cishell/reference/gui/log/LogView.java

From: <bh...@us...> - 2006-09-13 20:49:41

Revision: 183
          http://svn.sourceforge.net/cishell/?rev=183&view=rev
Author:   bh2
Date:     2006-09-13 13:49:38 -0700 (Wed, 13 Sep 2006)

Log Message:
-----------
got rid of unused variables in LogView

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	2006-09-13 20:47:59 UTC (rev 182)
+++ trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogView.java	2006-09-13 20:49:38 UTC (rev 183)
@@ -18,54 +18,46 @@
 import java.util.HashMap;
 import java.util.Map;
 
-//osgi
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogEntry;
-import org.osgi.service.log.LogListener;
-import org.osgi.service.log.LogReaderService;
-import org.osgi.service.log.LogService;
-
-//eclipse
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseMoveListener;
-import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.program.Program;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.program.Program;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogEntry;
+import org.osgi.service.log.LogListener;
+import org.osgi.service.log.LogReaderService;
+import org.osgi.service.log.LogService;
 
 
 /**
  * @author Weixia Huang (hu...@in...)
  *         Bruce Herr (bh...@bh...)
  */
-public class LogView extends ViewPart implements LogListener{
-    private static LogReaderService reader;
-    
+public class LogView extends ViewPart implements LogListener{    
 	private static LogView defaultView; 
 	private static Composite parent;	
 	private static StyledText text;
 	
-	private static int defaultLevel;
-	private static int currentLevel;
-	
 	private static Map colorMapping;
 	private static Color URL_COLOR;
 	private static Color LOG_ERROR_COLOR;
@@ -96,7 +88,6 @@
      */
     public LogView() {
     	defaultView = this;
-    	defaultLevel = LogService.LOG_INFO;
     	
         //TODO: Need to set the log level based on preferences service
  /*       Configuration cfg = IVC.getInstance().getConfiguration();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [182] trunk/clients/gui

From: <bh...@us...> - 2006-09-13 20:48:09

Revision: 182
          http://svn.sourceforge.net/cishell/?rev=182&view=rev
Author:   bh2
Date:     2006-09-13 13:47:59 -0700 (Wed, 13 Sep 2006)

Log Message:
-----------
moved the update and manage config action classes from the brand plugin to the generic workspace plugin and updated the plugin.xml to reflect that

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF
    trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml
    trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF
    trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java

Added Paths:
-----------
    trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ManageConfigurationAction.java
    trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/UpdateAction.java

Removed Paths:
-------------
    trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java
    trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java

Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF	2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF	2006-09-13 20:47:59 UTC (rev 182)
@@ -5,11 +5,10 @@
 Bundle-Version: 0.0.1.qualifier
 Bundle-Activator: org.cishell.reference.gui.brand.cishell.Activator
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
  org.cishell.reference.gui.datamanager,
  org.cishell.reference.gui.log,
  org.cishell.reference.gui.workspace,
- org.cishell.reference.gui.menumanager,
- org.eclipse.update.ui
+ org.cishell.reference.gui.menumanager
 Eclipse-LazyStart: true

Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml	2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml	2006-09-13 20:47:59 UTC (rev 182)
@@ -14,6 +14,9 @@
 	       <property
 	             name="aboutText"
 	             value="%blurb"/>
+        <property
+              name="startupProgressRect"
+              value="0,163,500,10"/>
 	   </product>
    	</extension>
 	   
@@ -39,7 +42,7 @@
 	</extension>
 	
 	<extension point="org.eclipse.ui.startup">
-    	<startup/>
+    	<startup class="org.cishell.reference.gui.brand.cishell.Activator"/>
  	</extension>
  <extension
        point="org.eclipse.ui.actionSets">
@@ -48,14 +51,14 @@
           label="Manager Action Set"
           visible="true">
        <action
-             class="org.cishell.reference.gui.brand.cishell.ManageConfigurationAction"
+             class="org.cishell.reference.gui.workspace.ManageConfigurationAction"
              icon="icons/manage.gif"
              id="org.cishell.reference.gui.configuration.manager.action"
              label="Manage Configuration..."
              menubarPath="help/end"
              style="push"/>
        <action
-             class="org.cishell.reference.gui.brand.cishell.UpdateAction"
+             class="org.cishell.reference.gui.workspace.UpdateAction"
              icon="icons/findandinstall.gif"
              id="org.cishell.reference.gui.update.manager.action"
              label="Update..."

Deleted: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java	2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java	2006-09-13 20:47:59 UTC (rev 182)
@@ -1,35 +0,0 @@
-/* **************************************************************************** 
- * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Apache License v2.0 which accompanies
- * this distribution, and is available at:
- * http://www.apache.org/licenses/LICENSE-2.0.html
- * 
- * Created on Sep 12, 2006 at Indiana University.
- * 
- * Contributors:
- *     Indiana University - 
- * ***************************************************************************/
-package org.cishell.reference.gui.brand.cishell;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.update.ui.UpdateManagerUI;
-
-public class ManageConfigurationAction implements IWorkbenchWindowActionDelegate {
-    Shell s;
-    
-    public void run(IAction action) {
-        UpdateManagerUI.openConfigurationManager(s);
-    }
-    
-    public void init(IWorkbenchWindow window) {
-        s = window.getShell();
-    }
-    public void dispose() {}
-    public void selectionChanged(IAction action, ISelection selection) {}
-}

Deleted: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java	2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java	2006-09-13 20:47:59 UTC (rev 182)
@@ -1,35 +0,0 @@
-/* **************************************************************************** 
- * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Apache License v2.0 which accompanies
- * this distribution, and is available at:
- * http://www.apache.org/licenses/LICENSE-2.0.html
- * 
- * Created on Sep 12, 2006 at Indiana University.
- * 
- * Contributors:
- *     Indiana University - 
- * ***************************************************************************/
-package org.cishell.reference.gui.brand.cishell;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.update.ui.UpdateManagerUI;
-
-public class UpdateAction implements IWorkbenchWindowActionDelegate {
-    Shell s;
-    
-    public void run(IAction action) {
-        UpdateManagerUI.openInstaller(s);
-    }
-
-    public void init(IWorkbenchWindow window) {
-        s = window.getShell();
-    }
-    public void dispose() {}
-    public void selectionChanged(IAction action, ISelection selection) {}
-}

Modified: trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF	2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF	2006-09-13 20:47:59 UTC (rev 182)
@@ -6,7 +6,8 @@
 Bundle-Activator: org.cishell.reference.gui.workspace.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.update.ui
 Eclipse-LazyStart: true
 Export-Package: org.cishell.reference.gui.workspace
 Import-Package: org.cishell.reference.gui.guibuilder.temp,

Modified: trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java	2006-09-12 23:16:48 UTC (rev 181)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java	2006-09-13 20:47:59 UTC (rev 182)
@@ -3,13 +3,14 @@
 import org.eclipse.core.runtime.IPlatformRunnable;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IStartup;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
 /**
  * This class controls all aspects of the application's execution
  */
-public class CIShellApplication implements IPlatformRunnable {
+public class CIShellApplication implements IPlatformRunnable, IStartup {
     private static IMenuManager menuManager;
     private static IWorkbenchWindow workbench;
 
@@ -44,4 +45,8 @@
     public static IWorkbenchWindow getWorkbench() {
         return CIShellApplication.workbench;
     }
+
+    public void earlyStartup() {
+        
+    }
 }

Copied: trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ManageConfigurationAction.java (from rev 181, trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java)
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ManageConfigurationAction.java	                        (rev 0)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ManageConfigurationAction.java	2006-09-13 20:47:59 UTC (rev 182)
@@ -0,0 +1,35 @@
+/* **************************************************************************** 
+ * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Apache License v2.0 which accompanies
+ * this distribution, and is available at:
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ * 
+ * Created on Sep 12, 2006 at Indiana University.
+ * 
+ * Contributors:
+ *     Indiana University - 
+ * ***************************************************************************/
+package org.cishell.reference.gui.workspace;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.update.ui.UpdateManagerUI;
+
+public class ManageConfigurationAction implements IWorkbenchWindowActionDelegate {
+    Shell s;
+    
+    public void run(IAction action) {
+        UpdateManagerUI.openConfigurationManager(s);
+    }
+    
+    public void init(IWorkbenchWindow window) {
+        s = window.getShell();
+    }
+    public void dispose() {}
+    public void selectionChanged(IAction action, ISelection selection) {}
+}

Copied: trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/UpdateAction.java (from rev 181, trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java)
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/UpdateAction.java	                        (rev 0)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/UpdateAction.java	2006-09-13 20:47:59 UTC (rev 182)
@@ -0,0 +1,35 @@
+/* **************************************************************************** 
+ * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Apache License v2.0 which accompanies
+ * this distribution, and is available at:
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ * 
+ * Created on Sep 12, 2006 at Indiana University.
+ * 
+ * Contributors:
+ *     Indiana University - 
+ * ***************************************************************************/
+package org.cishell.reference.gui.workspace;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.update.ui.UpdateManagerUI;
+
+public class UpdateAction implements IWorkbenchWindowActionDelegate {
+    Shell s;
+    
+    public void run(IAction action) {
+        UpdateManagerUI.openInstaller(s);
+    }
+
+    public void init(IWorkbenchWindow window) {
+        s = window.getShell();
+    }
+    public void dispose() {}
+    public void selectionChanged(IAction action, ISelection selection) {}
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [181] trunk/clients/gui

From: <bh...@us...> - 2006-09-12 23:17:02

Revision: 181
          http://svn.sourceforge.net/cishell/?rev=181&view=rev
Author:   bh2
Date:     2006-09-12 16:16:48 -0700 (Tue, 12 Sep 2006)

Log Message:
-----------
added the update manager and manage configuration 
features to the cishell gui

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF
    trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml
    trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ApplicationActionBarAdvisor.java
    trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java

Added Paths:
-----------
    trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/findandinstall.gif
    trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/manage.gif
    trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java
    trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java

Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF	2006-09-12 21:03:09 UTC (rev 180)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF	2006-09-12 23:16:48 UTC (rev 181)
@@ -10,5 +10,6 @@
  org.cishell.reference.gui.datamanager,
  org.cishell.reference.gui.log,
  org.cishell.reference.gui.workspace,
- org.cishell.reference.gui.menumanager
+ org.cishell.reference.gui.menumanager,
+ org.eclipse.update.ui
 Eclipse-LazyStart: true

Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/findandinstall.gif
===================================================================
(Binary files differ)


Property changes on: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/findandinstall.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/manage.gif
===================================================================
(Binary files differ)


Property changes on: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/manage.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml	2006-09-12 21:03:09 UTC (rev 180)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/plugin.xml	2006-09-12 23:16:48 UTC (rev 181)
@@ -41,4 +41,26 @@
 	<extension point="org.eclipse.ui.startup">
     	<startup/>
  	</extension>
+ <extension
+       point="org.eclipse.ui.actionSets">
+    <actionSet
+          id="org.cishell.reference.gui.management"
+          label="Manager Action Set"
+          visible="true">
+       <action
+             class="org.cishell.reference.gui.brand.cishell.ManageConfigurationAction"
+             icon="icons/manage.gif"
+             id="org.cishell.reference.gui.configuration.manager.action"
+             label="Manage Configuration..."
+             menubarPath="help/end"
+             style="push"/>
+       <action
+             class="org.cishell.reference.gui.brand.cishell.UpdateAction"
+             icon="icons/findandinstall.gif"
+             id="org.cishell.reference.gui.update.manager.action"
+             label="Update..."
+             menubarPath="help/end"
+             style="push"/>
+    </actionSet>
+ </extension>
 </plugin>

Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java	                        (rev 0)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/ManageConfigurationAction.java	2006-09-12 23:16:48 UTC (rev 181)
@@ -0,0 +1,35 @@
+/* **************************************************************************** 
+ * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Apache License v2.0 which accompanies
+ * this distribution, and is available at:
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ * 
+ * Created on Sep 12, 2006 at Indiana University.
+ * 
+ * Contributors:
+ *     Indiana University - 
+ * ***************************************************************************/
+package org.cishell.reference.gui.brand.cishell;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.update.ui.UpdateManagerUI;
+
+public class ManageConfigurationAction implements IWorkbenchWindowActionDelegate {
+    Shell s;
+    
+    public void run(IAction action) {
+        UpdateManagerUI.openConfigurationManager(s);
+    }
+    
+    public void init(IWorkbenchWindow window) {
+        s = window.getShell();
+    }
+    public void dispose() {}
+    public void selectionChanged(IAction action, ISelection selection) {}
+}

Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java	                        (rev 0)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/src/org/cishell/reference/gui/brand/cishell/UpdateAction.java	2006-09-12 23:16:48 UTC (rev 181)
@@ -0,0 +1,35 @@
+/* **************************************************************************** 
+ * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Apache License v2.0 which accompanies
+ * this distribution, and is available at:
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ * 
+ * Created on Sep 12, 2006 at Indiana University.
+ * 
+ * Contributors:
+ *     Indiana University - 
+ * ***************************************************************************/
+package org.cishell.reference.gui.brand.cishell;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+import org.eclipse.update.ui.UpdateManagerUI;
+
+public class UpdateAction implements IWorkbenchWindowActionDelegate {
+    Shell s;
+    
+    public void run(IAction action) {
+        UpdateManagerUI.openInstaller(s);
+    }
+
+    public void init(IWorkbenchWindow window) {
+        s = window.getShell();
+    }
+    public void dispose() {}
+    public void selectionChanged(IAction action, ISelection selection) {}
+}

Modified: trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ApplicationActionBarAdvisor.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ApplicationActionBarAdvisor.java	2006-09-12 21:03:09 UTC (rev 180)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/ApplicationActionBarAdvisor.java	2006-09-12 23:16:48 UTC (rev 181)
@@ -3,6 +3,7 @@
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory;
@@ -21,20 +22,19 @@
 	// them in the fill methods. This ensures that the actions aren't recreated
 	// when fillActionBars is called with FILL_PROXY.
 	private IWorkbenchAction exitAction;
-    private IWorkbenchAction aboutAction;
-    
+    private IWorkbenchAction aboutAction;    
 
 	public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
 		super(configurer);
 	}
 
 	protected void makeActions(final IWorkbenchWindow window) {
+        CIShellApplication.setWorkbench(window);
 		// Creates the actions and registers them.
 		// Registering is needed to ensure that key bindings work.
 		// The corresponding commands keybindings are defined in the plugin.xml
 		// file. Registering also provides automatic disposal of the actions 
 		// when the window is closed.
-
 		exitAction = ActionFactory.QUIT.create(window);
 		register(exitAction);
         
@@ -60,6 +60,7 @@
         fileMenu.add(exitAction);
        
         //Help menu items
+        helpMenu.add(new Separator());
         helpMenu.add(aboutAction);
 	}
     

Modified: trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java	2006-09-12 21:03:09 UTC (rev 180)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/src/org/cishell/reference/gui/workspace/CIShellApplication.java	2006-09-12 23:16:48 UTC (rev 181)
@@ -3,6 +3,7 @@
 import org.eclipse.core.runtime.IPlatformRunnable;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
 /**
@@ -10,6 +11,7 @@
  */
 public class CIShellApplication implements IPlatformRunnable {
     private static IMenuManager menuManager;
+    private static IWorkbenchWindow workbench;
 
 	/**
 	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
@@ -27,11 +29,19 @@
 		}
 	}
     
-    public static void setMenuManager(IMenuManager menuManager) {
+    protected static void setMenuManager(IMenuManager menuManager) {
         CIShellApplication.menuManager = menuManager; 
     }
     
     public static IMenuManager getMenuManager() {
         return menuManager;
     }
+    
+    protected static void setWorkbench(IWorkbenchWindow workbench) {
+        CIShellApplication.workbench = workbench;
+    }
+    
+    public static IWorkbenchWindow getWorkbench() {
+        return CIShellApplication.workbench;
+    }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [177] trunk/clients/gui/org.cishell.reference.gui.log/ src/org/cishell/reference/gui/log

From: <hu...@us...> - 2006-09-11 20:59:00

Revision: 177
          http://svn.sourceforge.net/cishell/?rev=177&view=rev
Author:   huangb
Date:     2006-09-11 13:58:38 -0700 (Mon, 11 Sep 2006)

Log Message:
-----------
Move all basic features implemented in IVCConsole to LogView. 
Implement LogListener and display log messages when any component uses the Log service to log a message.
Refer to the req_LogView documentation for the complete feature list. 
ToDo: need to get the log level from the preferences.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/Activator.java
    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/Activator.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/Activator.java	2006-09-11 20:08:20 UTC (rev 176)
+++ trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/Activator.java	2006-09-11 20:58:38 UTC (rev 177)
@@ -2,10 +2,6 @@
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogEntry;
-import org.osgi.service.log.LogListener;
-import org.osgi.service.log.LogReaderService;
 
 /**
  * The activator class controls the plug-in life cycle
@@ -13,6 +9,7 @@
 public class Activator extends AbstractUIPlugin {
 	public static final String PLUGIN_ID = "org.cishell.reference.gui.log";
 	private static Activator plugin;
+	private static BundleContext context;
 	
 	public Activator() {
 		plugin = this;
@@ -20,6 +17,9 @@
 
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
+		Activator.context = context; 
+		
+/*		System.out.println("Started...");
         
         LogListener listener = new LogListener() {
             public void logged(LogEntry e) {
@@ -39,12 +39,14 @@
                 }
             }
         };
-        
+       
         ServiceReference ref = context.getServiceReference(LogReaderService.class.getName());
         LogReaderService reader = (LogReaderService) context.getService(ref);
         if (reader != null) {
-            reader.addLogListener(listener);
+            reader.addLogListener(listener);   
+            reader.addLogListener(new LogView());
         }
+ */       
 	}
 
 	public void stop(BundleContext context) throws Exception {
@@ -55,4 +57,8 @@
 	public static Activator getDefault() {
 		return plugin;
 	}
+	
+	public static BundleContext getContext() {
+		return context;
+	}
 }

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	2006-09-11 20:08:20 UTC (rev 176)
+++ trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogView.java	2006-09-11 20:58:38 UTC (rev 177)
@@ -9,37 +9,370 @@
  * Created on Aug 21, 2006 at Indiana University.
  * 
  * Contributors:
- *     Indiana University - 
+ * 	   Weixia(Bonnie) Huang, Bruce Herr
+ *     School of Library and Information Science, Indiana University 
  * ***************************************************************************/
 package org.cishell.reference.gui.log;
 
+//standard java
+import java.util.HashMap;
+import java.util.Map;
+
+//osgi
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogEntry;
+import org.osgi.service.log.LogListener;
+import org.osgi.service.log.LogReaderService;
+import org.osgi.service.log.LogService;
+
+//eclipse
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseMoveListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.program.Program;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.ViewPart;
 
+
 /**
- * 
- * @author Bruce Herr (bh...@bh...)
+ * @author Weixia Huang (hu...@in...)
+ *         Bruce Herr (bh...@bh...)
  */
-public class LogView extends ViewPart {
+public class LogView extends ViewPart implements LogListener{
+    private static LogReaderService reader;
+    
+	private static LogView defaultView; 
+	private static Composite parent;	
+	private static StyledText text;
+	
+	private static int defaultLevel;
+	private static int currentLevel;
+	
+	private static Map colorMapping;
+	private static Color URL_COLOR;
+	private static Color LOG_ERROR_COLOR;
+	private static Color LOG_WARNING_COLOR;
+	//FOR ALGORITHM INFO
+	private static Color LOG_INFO_COLOR;
+	//FOR ACTIVITY INFO
+	private static Color LOG_DEBUG_COLOR;
+	   
+	private static URLClickedListener urlListener;
+    private static URLMouseCursorListener urlCursorListener;
+    
+    static {
+    	Display.getDefault().syncExec(new Runnable(){
+        	public void run(){
+            	LOG_ERROR_COLOR = Display.getDefault().getSystemColor(SWT.COLOR_RED);
+            	LOG_WARNING_COLOR = new Color(Display.getDefault(), 255, 127, 0); //orange
+            	LOG_INFO_COLOR = Display.getDefault().getSystemColor(SWT.COLOR_BLACK);
+                LOG_DEBUG_COLOR = new Color(Display.getDefault(), 150, 150, 150); //gray
+                               
+                URL_COLOR = Display.getDefault().getSystemColor(SWT.COLOR_BLUE);
+            }
+        });
+    }
 
-    
+    /**
+     * Constructor
+     */
     public LogView() {
+    	defaultView = this;
+    	defaultLevel = LogService.LOG_INFO;
+    	
+        //TODO: Need to set the log level based on preferences service
+ /*       Configuration cfg = IVC.getInstance().getConfiguration();
+        boolean showAll = cfg.getBoolean(IVCPreferences.SHOW_ALL_ERRORS_PREFERENCE);
+        boolean showCritical = cfg.getBoolean(IVCPreferences.SHOW_CRITICAL_ERRORS_PREFERENCE);
+        if(showAll || showCritical){
+            currentLevel = LogService.LOG_DEBUG;
+        }
+        else{
+            currentLevel = LogService.LOG_INFO;
+        }
+*/
+        colorMapping = new HashMap();
+        colorMapping.put(LogService.LOG_DEBUG, LOG_DEBUG_COLOR);
+        colorMapping.put(LogService.LOG_INFO, LOG_INFO_COLOR);
+        colorMapping.put(LogService.LOG_WARNING, LOG_WARNING_COLOR);
+        colorMapping.put(LogService.LOG_ERROR, LOG_ERROR_COLOR);
+
     }
 
+    public static LogView getDefault() {
+    	return defaultView;
+    }
+
     /**
      * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
      */
     public void createPartControl(Composite parent) {
-        Label label = new Label(parent, SWT.NONE);
-        label.setText("Log View");
+   	
+    	LogView.parent = parent;
+        text = new StyledText(parent,
+                SWT.BORDER | SWT.V_SCROLL | SWT.WRAP | SWT.READ_ONLY);
+        text.setEditable(false);
+        text.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+        text.getCaret().setVisible(false);
+        
+        //handle url
+        urlListener = new URLClickedListener();
+        text.addMouseListener(urlListener);
+        urlCursorListener = new URLMouseCursorListener();
+        text.addMouseMoveListener(urlCursorListener);
+        
+        //add copy context menu when hover a block of text and right click the mouse
+        Display display = Display.getDefault();
+        final Clipboard cb = new Clipboard(display);
+        final Menu menu = new Menu(text);
+        menu.setVisible(false);
+
+        MenuItem actionItem = new MenuItem(menu, SWT.PUSH);
+        actionItem.setText("Copy");
+        actionItem.addListener(SWT.Selection,
+                new Listener() {
+                    public void handleEvent(Event event) {
+                        String textData = text.getSelectionText();
+                        TextTransfer textTransfer = TextTransfer.getInstance();
+                        cb.setContents(new Object[] { textData },
+                            new Transfer[] { textTransfer });
+                    }
+                });
+
+         text.addSelectionListener(new SelectionAdapter() {
+        	 public void widgetSelected(SelectionEvent e) {
+        		 String selection = ((StyledText) e.widget).getSelectionText();
+
+                 if (selection.equals("")) {
+                	 text.setMenu(null);
+                 } else {
+                	 text.setMenu(menu);
+                 }
+        	 }
+          });
+ 
+         //Get LogReaderService through BundleContext
+         //Add itself to the LogReaderService as a LogListener
+         BundleContext context = Activator.getContext();
+         ServiceReference ref = context.getServiceReference(LogReaderService.class.getName());
+         LogReaderService reader = (LogReaderService) context.getService(ref);
+         if (reader != null) {
+        	 reader.addLogListener(this);               
+         }
+         else
+        	 System.out.println("reader is null");
     }
 
     /**
      * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
      */
     public void setFocus() {
+    	text.setFocus();
+    }
+    
+    public void logged(final LogEntry entry) {
         
+    	PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
+			public void run() {
+				String message = entry.getMessage();
+				try {
+					if (goodMessage(message)) {
+						appendString(message, (Color) colorMapping.get(entry.getLevel()));						
+					}
+				} catch (Throwable e) {
+					e.printStackTrace();
+				}
+			}
+    	});
+    	
     }
+    
+    private boolean goodMessage(String msg) {
+        if (msg == null || 
+                msg.startsWith("ServiceEvent ") || 
+                msg.startsWith("BundleEvent ") || 
+                msg.startsWith("FrameworkEvent ")) {
+            return false;
+        } else {
+            return true;   
+        }
+    }
+    
+    /*
+     * append the given string to the console with the given color,
+     * this will do the job of checking for URLs within the string and
+     * registering the proper listeners on them as well.
+     */
+    private void appendString(String message, Color color) {
+        int index = message.indexOf("http://");
+
+        if (index == -1) {
+            index = message.indexOf("www.");
+        }
+
+        if (index > -1) {
+            String url = message.substring(index);
+
+            if (url.indexOf(" ") > -1) {
+                url = url.substring(0, url.indexOf(" "));
+            }
+
+            if (url.indexOf("\n") > -1) {
+                url = url.substring(0, url.indexOf("\n"));
+            }
+
+            if (url.indexOf("\t") > -1) {
+                url = url.substring(0, url.indexOf("\n"));
+            }
+
+            printHelper(message.substring(0, index), color, SWT.NORMAL);
+            urlListener.addUrl(text.getText().length(), url);
+            urlCursorListener.addUrl(text.getText().length(), url);
+            printHelper(url, URL_COLOR, SWT.BOLD);
+            appendString(message.substring(index + url.length()), color);
+        } else {
+            printHelper(message, color, SWT.NORMAL);
+        }
+    }
+    
+    /*
+     * helper to actually format the string with a style range and
+     * append it to the StyledText control
+     */
+    private static void printHelper(final String inText, final Color color, final int style) {        
+        Display.getDefault().syncExec(new Runnable(){
+            public void run(){
+		        if (!text.isDisposed()) {
+		            text.append(inText);
+		
+		            StyleRange sr = new StyleRange();
+		            sr.start = text.getText().length() - inText.length();
+		            sr.length = inText.length();
+		            sr.foreground = color;
+		            sr.fontStyle = style;
+		            text.setStyleRange(sr);
+		
+		            //autoscroll
+		            text.setTopIndex(text.getLineCount());
+		        }
+            }
+        });
+    }
+
+    
+    /*
+     * class that monitors the mouse and changes the cursor when it is
+     * over a URL
+     */
+    private class URLMouseCursorListener implements MouseMoveListener {
+        Map offsetToUrlMap = new HashMap();
+
+        public void addUrl(int offset, String url) {
+            offsetToUrlMap.put(new Integer(offset), url);
+        }
+
+        public void mouseMove(MouseEvent e) {
+            int position = -1;
+
+            try {
+                position = text.getOffsetAtLocation(new Point(e.x, e.y));
+            } catch (IllegalArgumentException ex) {
+                Cursor cursor = new Cursor(parent.getDisplay(), SWT.CURSOR_ARROW);
+                text.setCursor(cursor);
+            }
+
+            if (position < 0) {
+                return;
+            }
+
+            Integer[] offsets = new Integer[1];
+            offsets = (Integer[]) offsetToUrlMap.keySet().toArray(offsets);
+
+            boolean overURL = false;
+
+            for (int i = 0; i < offsets.length; i++) {
+                Integer offset = offsets[i];
+                String url = (String) offsetToUrlMap.get(offset);
+
+                if ((position >= offset.intValue()) &&
+                        (position <= (offset.intValue() + url.length()))) {
+                    overURL = true;
+
+                    break;
+                }
+            }
+            
+            if (overURL) {
+                Cursor cursor = new Cursor(parent.getDisplay(), SWT.CURSOR_HAND);
+                text.setCursor(cursor);
+            } else {
+                Cursor cursor = new Cursor(parent.getDisplay(), SWT.CURSOR_ARROW);
+                text.setCursor(cursor);
+            }
+        }
+    }
+
+    /*
+     * class that listens for clicks on urls and launches a browser appropriatly
+     */
+    private class URLClickedListener extends MouseAdapter {
+        Map offsetToUrlMap = new HashMap();
+
+        public void addUrl(int offset, String url) {           
+            offsetToUrlMap.put(new Integer(offset), url);
+        }
+
+        public void mouseDown(MouseEvent e) {
+            if (e.button != 1) {
+                return;
+            }
+
+            int clicked = -1;
+
+            try {
+                clicked = text.getOffsetAtLocation(new Point(e.x, e.y));
+            } catch (IllegalArgumentException ex) {
+            }
+
+            if (clicked < 0) {
+                return;
+            }
+
+            Integer[] offsets = new Integer[1];
+            offsets = (Integer[]) offsetToUrlMap.keySet().toArray(offsets);
+
+            for (int i = 0; i < offsets.length; i++) {
+                Integer offset = offsets[i];
+                String url = (String) offsetToUrlMap.get(offset);
+
+                if ((clicked >= offset.intValue()) &&
+                        (clicked <= (offset.intValue() + url.length()))) {
+                    try {
+                        Program.launch(url);
+                    } catch (Exception e1) {
+                    }
+                }
+            }
+        }
+    }
+
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [106] trunk/examples/org.cishell.tests.alg1/

From: <bh...@us...> - 2006-07-28 20:47:00

Revision: 106
Author:   bh2
Date:     2006-07-27 09:39:14 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/cishell/?rev=106&view=rev

Log Message:
-----------
Initial import.

Added Paths:
-----------
    trunk/examples/org.cishell.tests.alg1/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [103] trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting

From: <bh...@us...> - 2006-07-28 20:08:39

Revision: 103
Author:   bh2
Date:     2006-07-27 09:36:50 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/cishell/?rev=103&view=rev

Log Message:
-----------
* cleaned up the reference remoting code a little bit

Modified Paths:
--------------
    trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellClient.java
    trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellServer.java
    trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/ObjectRegistry.java
    trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/RemotingClient.java
    trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/client/DataModelRegistryClient.java
    trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/frontend/CIShellClientAlg.java
    trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/AlgorithmFactoryRegistryServer.java
    trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/conversion/RemoteDataConversionServiceServer.java
    trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/guibuilder/RemoteGUIBuilder.java
    trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferencesService.java

Removed Paths:
-------------
    trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferences.java
Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellClient.java
===================================================================
--- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellClient.java	2006-07-26 20:12:33 UTC (rev 102)
+++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellClient.java	2006-07-27 16:36:50 UTC (rev 103)
@@ -188,7 +188,7 @@
                 if ("AlgServiceListener".equalsIgnoreCase(
                         (String)inEvent.get(CIShellEventConstants.TARGET_SERVICE))){
                     
-                    updateAlgs(event);
+                    processAlgEvent(event);
                 } else {
                     eventAdmin.postEvent(event);
                 }
@@ -196,7 +196,7 @@
         }
     }
     
-    private void updateAlgs(Event inEvent) {
+    private void processAlgEvent(Event inEvent) {
         String pid = (String) inEvent.getProperty(Constants.SERVICE_PID);
         String event = ((String) inEvent.getProperty(CIShellEventConstants.EVENT_TYPE));
         

Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellServer.java
===================================================================
--- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellServer.java	2006-07-26 20:12:33 UTC (rev 102)
+++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/CIShellServer.java	2006-07-27 16:36:50 UTC (rev 103)
@@ -39,10 +39,7 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
-/**
- * 
- * @author Bruce Herr (bh...@bh...)
- */
+
 public class CIShellServer {
     private BundleContext bContext;
     private List services;

Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/ObjectRegistry.java
===================================================================
--- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/ObjectRegistry.java	2006-07-26 20:12:33 UTC (rev 102)
+++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/ObjectRegistry.java	2006-07-27 16:36:50 UTC (rev 103)
@@ -16,10 +16,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * 
- * @author Bruce Herr (bh...@bh...)
- */
+
 public class ObjectRegistry {
     long lastID;
     Map idToObjectMap;

Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/RemotingClient.java
===================================================================
--- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/RemotingClient.java	2006-07-26 20:12:33 UTC (rev 102)
+++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/RemotingClient.java	2006-07-27 16:36:50 UTC (rev 103)
@@ -16,6 +16,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Array;
+import java.util.Arrays;
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -32,10 +33,6 @@
 import org.ksoap2.transport.HttpTransportSE;
 
 
-/**
- * 
- * @author Bruce Herr (bh...@bh...)
- */
 public class RemotingClient {
     public static final String NULL_STR = "@@NULL@@";
 
@@ -61,8 +58,8 @@
         slowCache = new CacheMap(10000);
     }
     
-    protected void setCacheing(String command, boolean fastCacheing) {
-        if (fastCacheing) {
+    protected void setCacheing(String command, boolean doFastCacheing) {
+        if (doFastCacheing) {
             caches.put(command, fastCache);
         } else {
             caches.put(command, slowCache);
@@ -74,7 +71,7 @@
         endpoint = host + servicePath;
 
         httpTransport = new HttpTransportSE(endpoint);
-        httpTransport.debug = true;
+        httpTransport.debug = bDebug;
         
         soapEnvelope = new SoapSerializationEnvelope(SoapEnvelope.VER12);
         new MarshalHashtable().register(soapEnvelope);
@@ -131,10 +128,8 @@
             new MarshalHashtable().register(soapEnvelope);
             new MarshalBase64().register(soapEnvelope);
             
-                SoapObject rpc = new SoapObject(
-                        "http://www.w3.org/2001/12/soap-envelope", opName);
-//            SoapObject rpc = new SoapObject(
-//                    "http://schemas.xmlsoap.org/soap/envelope/", opName);
+            SoapObject rpc = new SoapObject(
+                    "http://www.w3.org/2001/12/soap-envelope", opName);
             
             for (int i = 0; i < params.length; i++) {
                 if (bDebug)
@@ -156,11 +151,9 @@
             }
             return r;
         } catch (Exception e) {
-            e.printStackTrace();
             throw new NestedRuntimeException("Failed to call " + opName
                     + ": ", e);
         }
-    
     }
 
     protected long[] toLongArray(Object obj) {
@@ -216,7 +209,20 @@
         //TODO: better hashtable parsing
         for (Enumeration i = dict.keys(); i.hasMoreElements() ;) {
             Object key = i.nextElement().toString();
-            ht.put(key, "" + dict.get(key));
+            
+            Object value = dict.get(key);
+            
+            if (value instanceof Vector) {
+                
+            } else if (value instanceof Dictionary) {
+                value = toHashtable(dict);
+            } else if (value instanceof String[]) {
+                value = new Vector(Arrays.asList((String[])value));
+            } else {
+                value = "" + value;
+            }
+            
+            ht.put(key, value);
         }
         
         return ht;

Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/client/DataModelRegistryClient.java
===================================================================
--- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/client/DataModelRegistryClient.java	2006-07-26 20:12:33 UTC (rev 102)
+++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/client/DataModelRegistryClient.java	2006-07-27 16:36:50 UTC (rev 103)
@@ -130,16 +130,11 @@
         } else {
             Hashtable properties = null;
             if (dm.getMetaData() != null) {
-                properties = new Hashtable(dm.getMetaData().size());
-                for (Enumeration i = dm.getMetaData().keys(); i.hasMoreElements(); ) {
-                    Object key = i.nextElement();
-                    properties.put(key, dm.getMetaData().get(key).toString());
-                }
+                properties = toHashtable(dm.getMetaData());
             } else {
                 properties = new Hashtable();
             }
             
-            
             //find file-friendly format to convert to
             String format = dm.getFormat();
             String finalOutFormat = null;
@@ -289,20 +284,12 @@
                             out.write(raw);
                             out.close();
                             
-                            data = file;
+                            DataModel dm = new BasicDataModel(new Hashtable(), 
+                                    file, inFormat);
+                            dm = convert[0].convert(dm);
                             
-                            Dictionary props = new Hashtable();
-                            
-                            DataModel[] dm = new DataModel[] {
-                                    new BasicDataModel(props, data, inFormat)
-                            };
-                            
-                            AlgorithmFactory factory = convert[0].getAlgorithmFactory();
-                            Algorithm alg = factory.createAlgorithm(dm, new Hashtable(), ciContext);
-                            dm = alg.execute();
-                            
                             if (dm != null) {
-                                data = dm[0].getData();
+                                data = dm.getData();
                             }
                         }
                     } catch (IOException e) {

Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/frontend/CIShellClientAlg.java
===================================================================
--- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/frontend/CIShellClientAlg.java	2006-07-26 20:12:33 UTC (rev 102)
+++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/frontend/CIShellClientAlg.java	2006-07-27 16:36:50 UTC (rev 103)
@@ -53,8 +53,6 @@
                 int port = ((Integer) parameters.get("org.cishell.reference.remoting.frontend.client.port")).intValue();
                 
                 new ClientInstanceAlg(bContext, context).connect(host, port);
-//                new ClientInstanceAlg(bContext).connect("localhost", 8180);
-                
                 return null;
             }};
         

Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/AlgorithmFactoryRegistryServer.java
===================================================================
--- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/AlgorithmFactoryRegistryServer.java	2006-07-26 20:12:33 UTC (rev 102)
+++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/AlgorithmFactoryRegistryServer.java	2006-07-27 16:36:50 UTC (rev 103)
@@ -13,6 +13,7 @@
  * ***************************************************************************/
 package org.cishell.reference.remoting.server;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
@@ -71,9 +72,6 @@
             DataModel[] dm = dmReg.getDataModels(dataModelIDs);
             
             CIShellContext ciContext = null;
-            //TODO: fix dictionary parsing
-            //long mtpID = createParameters(servicePID, dataModelIDs);
-            //dictionary = mtpReg.parseDictionary(mtpID, "-1", dictionary);
             synchronized (sidToContextMap) {
                 ciContext = (CIShellContext) sidToContextMap.get(sessionID); 
                 
@@ -83,6 +81,8 @@
                 }
             }
             
+            //TODO: should parse the given hashtable since values may need to 
+            //be changed to different types (Vector->String[], etc...)
             Algorithm alg = factory.createAlgorithm(dm, dictionary, ciContext);
             if (alg != null) {
                 algID = algReg.registerAlgorithm(alg);
@@ -129,7 +129,17 @@
             String[] keys = refs[0].getPropertyKeys();
             
             for (int i=0; i < keys.length; i++) {
-                ht.put(keys[i], ""+refs[0].getProperty(keys[i]));
+                Object value = refs[0].getProperty(keys[i]);
+                
+                if (value instanceof Vector) {
+                    
+                } else if (value instanceof String[]) {
+                    value = new Vector(Arrays.asList((String[])value));
+                } else {
+                    value = "" + value;
+                }
+                
+                ht.put(keys[i], value);
             }
             
             return ht;

Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/conversion/RemoteDataConversionServiceServer.java
===================================================================
--- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/conversion/RemoteDataConversionServiceServer.java	2006-07-26 20:12:33 UTC (rev 102)
+++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/conversion/RemoteDataConversionServiceServer.java	2006-07-27 16:36:50 UTC (rev 103)
@@ -91,16 +91,17 @@
         return null;
     }
 
+    /**
+     * @see org.cishell.remoting.service.conversion.RemoteDataConversionService#getConversions(java.lang.String, java.lang.String)
+     */
     public Vector getConversions(String dataModelID, String outFormat) {
         DataModelRegistry dmRegistry = (DataModelRegistry) dmReg.getService();
-        DataConversionService converter = getConverter();
+        DataModel dm = dmRegistry.getDataModel(dataModelID);
         
         Set conversions = new HashSet();
-        Vector formats = dmRegistry.getDataFormats(dataModelID);
-        for (Iterator i=formats.iterator(); i.hasNext(); ) {
-            String inFormat = (String) i.next();
+        if (dm != null) {
+            Converter[] converters = getConverter().findConverters(dm, outFormat);
             
-            Converter[] converters = converter.findConverters(inFormat, outFormat);
             for (int j=0; j < converters.length; j++) {
                 conversions.add(converters[j].getProperties().get(AlgorithmProperty.OUT_DATA));
             }

Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/guibuilder/RemoteGUIBuilder.java
===================================================================
--- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/guibuilder/RemoteGUIBuilder.java	2006-07-26 20:12:33 UTC (rev 102)
+++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/guibuilder/RemoteGUIBuilder.java	2006-07-27 16:36:50 UTC (rev 103)
@@ -22,6 +22,7 @@
 import org.osgi.service.metatype.MetaTypeProvider;
 
 /**
+ * TODO: Finish this class and integrate it.
  * 
  * @author Bruce Herr (bh...@bh...)
  */
@@ -35,7 +36,6 @@
      * @see org.cishell.service.guibuilder.GUIBuilderService#createGUI(java.lang.String, org.osgi.service.metatype.MetaTypeProvider)
      */
     public GUI createGUI(String id, MetaTypeProvider parameters) {
-        
         return null;
     }
 
@@ -43,7 +43,6 @@
      * @see org.cishell.service.guibuilder.GUIBuilderService#createGUIandWait(java.lang.String, org.osgi.service.metatype.MetaTypeProvider)
      */
     public Dictionary createGUIandWait(String id, MetaTypeProvider parameters) {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -51,7 +50,6 @@
      * @see org.cishell.service.guibuilder.GUIBuilderService#showConfirm(java.lang.String, java.lang.String, java.lang.String)
      */
     public boolean showConfirm(String title, String message, String detail) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -59,31 +57,24 @@
      * @see org.cishell.service.guibuilder.GUIBuilderService#showError(java.lang.String, java.lang.String, java.lang.String)
      */
     public void showError(String title, String message, String detail) {
-        // TODO Auto-generated method stub
-
     }
 
     /**
      * @see org.cishell.service.guibuilder.GUIBuilderService#showError(java.lang.String, java.lang.String, java.lang.Throwable)
      */
     public void showError(String title, String message, Throwable error) {
-        // TODO Auto-generated method stub
-
     }
 
     /**
      * @see org.cishell.service.guibuilder.GUIBuilderService#showInformation(java.lang.String, java.lang.String, java.lang.String)
      */
     public void showInformation(String title, String message, String detail) {
-        // TODO Auto-generated method stub
-
     }
 
     /**
      * @see org.cishell.service.guibuilder.GUIBuilderService#showQuestion(java.lang.String, java.lang.String, java.lang.String)
      */
     public boolean showQuestion(String title, String message, String detail) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -91,8 +82,5 @@
      * @see org.cishell.service.guibuilder.GUIBuilderService#showWarning(java.lang.String, java.lang.String, java.lang.String)
      */
     public void showWarning(String title, String message, String detail) {
-        // TODO Auto-generated method stub
-
     }
-
 }

Deleted: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferences.java
===================================================================
--- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferences.java	2006-07-26 20:12:33 UTC (rev 102)
+++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferences.java	2006-07-27 16:36:50 UTC (rev 103)
@@ -1,233 +0,0 @@
-/* **************************************************************************** 
- * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Apache License v2.0 which accompanies
- * this distribution, and is available at:
- * http://www.apache.org/licenses/LICENSE-2.0.html
- * 
- * Created on Jul 13, 2006 at Indiana University.
- * 
- * Contributors:
- *     Indiana University - 
- * ***************************************************************************/
-package org.cishell.reference.remoting.server.service.prefs;
-
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * 
- * @author Bruce Herr (bh...@bh...)
- */
-public class RemotePreferences implements Preferences {
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#absolutePath()
-     */
-    public String absolutePath() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#childrenNames()
-     */
-    public String[] childrenNames() throws BackingStoreException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#clear()
-     */
-    public void clear() throws BackingStoreException {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#flush()
-     */
-    public void flush() throws BackingStoreException {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#get(java.lang.String, java.lang.String)
-     */
-    public String get(String key, String def) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#getBoolean(java.lang.String, boolean)
-     */
-    public boolean getBoolean(String key, boolean def) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#getByteArray(java.lang.String, byte[])
-     */
-    public byte[] getByteArray(String key, byte[] def) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#getDouble(java.lang.String, double)
-     */
-    public double getDouble(String key, double def) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#getFloat(java.lang.String, float)
-     */
-    public float getFloat(String key, float def) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#getInt(java.lang.String, int)
-     */
-    public int getInt(String key, int def) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#getLong(java.lang.String, long)
-     */
-    public long getLong(String key, long def) {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#keys()
-     */
-    public String[] keys() throws BackingStoreException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#name()
-     */
-    public String name() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#node(java.lang.String)
-     */
-    public Preferences node(String pathName) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#nodeExists(java.lang.String)
-     */
-    public boolean nodeExists(String pathName) throws BackingStoreException {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#parent()
-     */
-    public Preferences parent() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#put(java.lang.String, java.lang.String)
-     */
-    public void put(String key, String value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#putBoolean(java.lang.String, boolean)
-     */
-    public void putBoolean(String key, boolean value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#putByteArray(java.lang.String, byte[])
-     */
-    public void putByteArray(String key, byte[] value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#putDouble(java.lang.String, double)
-     */
-    public void putDouble(String key, double value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#putFloat(java.lang.String, float)
-     */
-    public void putFloat(String key, float value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#putInt(java.lang.String, int)
-     */
-    public void putInt(String key, int value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#putLong(java.lang.String, long)
-     */
-    public void putLong(String key, long value) {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#remove(java.lang.String)
-     */
-    public void remove(String key) {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#removeNode()
-     */
-    public void removeNode() throws BackingStoreException {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @see org.osgi.service.prefs.Preferences#sync()
-     */
-    public void sync() throws BackingStoreException {
-        // TODO Auto-generated method stub
-
-    }
-
-}

Modified: trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferencesService.java
===================================================================
--- trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferencesService.java	2006-07-26 20:12:33 UTC (rev 102)
+++ trunk/clients/remoting/org.cishell.reference.remoting/src/org/cishell/reference/remoting/server/service/prefs/RemotePreferencesService.java	2006-07-27 16:36:50 UTC (rev 103)
@@ -22,7 +22,7 @@
 import org.osgi.service.prefs.PreferencesService;
 import org.osgi.util.tracker.ServiceTracker;
 
-//TODO: Finish making this class..
+//TODO: Finish making remote prefrences class..
 public class RemotePreferencesService extends AbstractEventConsumerProducer {
     ServiceTracker localPrefs;
     String[] users;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [100] trunk/core/org.cishell.framework/src/org/cishell/service/conversion

From: <bh...@us...> - 2006-07-28 02:40:35

Revision: 100
Author:   bh2
Date:     2006-07-26 10:34:38 -0700 (Wed, 26 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/cishell/?rev=100&view=rev

Log Message:
-----------
* some more code clean up and small refactorings

Modified Paths:
--------------
    trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AlgorithmFactoryRegistry.java
    trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AlgorithmRegistry.java
    trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AttributeDefinitionRegistry.java
    trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/CIShellFramework.java
    trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/DataModelRegistry.java
    trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/MetaTypeProviderRegistry.java
    trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/ObjectClassDefinitionRegistry.java
    trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerAdapter.java
    trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerListener.java
    trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerService.java
    trunk/core/org.cishell.framework/src/org/cishell/service/conversion/Converter.java
    trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/modelmanager/ModelManagerServiceImpl.java
    trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java
    trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java
Modified: trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AlgorithmFactoryRegistry.java
===================================================================
--- trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AlgorithmFactoryRegistry.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AlgorithmFactoryRegistry.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -20,7 +20,6 @@
 
 public interface AlgorithmFactoryRegistry {
     public static String SERVICE_NAME = "AlgorithmFactoryRegistry";
-    public static String SERVICE_METHODS = "createParameters createAlgorithm";
     
     public String createParameters(String servicePID, Vector dataModelIDs);
 

Modified: trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AlgorithmRegistry.java
===================================================================
--- trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AlgorithmRegistry.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AlgorithmRegistry.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -18,7 +18,6 @@
 
 public interface AlgorithmRegistry {
     public static String SERVICE_NAME = "AlgorithmRegistry";
-    public static String SERVICE_METHODS = "execute unregisterAlgorithm";
     
     public void execute(String sessionID, String algorithmID);
     

Modified: trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AttributeDefinitionRegistry.java
===================================================================
--- trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AttributeDefinitionRegistry.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/AttributeDefinitionRegistry.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -19,7 +19,6 @@
 
 public interface AttributeDefinitionRegistry {
     public static String SERVICE_NAME = "AttributeDefinitionRegistry";
-    public static String SERVICE_METHODS = "*";
     
     public int getCardinality(String attrID);
     public Vector getDefaultValue(String attrID);

Modified: trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/CIShellFramework.java
===================================================================
--- trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/CIShellFramework.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/CIShellFramework.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -18,7 +18,6 @@
 
 public interface CIShellFramework {
     public static String SERVICE_NAME = "CIShellFramework";
-    public static String SERVICE_METHODS = "createSession getLifeCycleEvents getAlgorithmFactories";
     
     public String createSession(String clientURL);
     public void closeSession(String sessionID);

Modified: trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/DataModelRegistry.java
===================================================================
--- trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/DataModelRegistry.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/DataModelRegistry.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -20,7 +20,6 @@
 
 public interface DataModelRegistry {
     public static String SERVICE_NAME = "DataModelRegistry";
-    public static String SERVICE_METHODS = "*";
     
     public Hashtable getProperties(String dataModelID);
     

Modified: trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/MetaTypeProviderRegistry.java
===================================================================
--- trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/MetaTypeProviderRegistry.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/MetaTypeProviderRegistry.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -19,7 +19,6 @@
 
 public interface MetaTypeProviderRegistry {
     public static String SERVICE_NAME = "MetaTypeProviderRegistry";
-    public static String SERVICE_METHODS = "*";
     
     public Vector getLocales(String providerID);
     public String getObjectClassDefinition(String providerID, String id, String locale);

Modified: trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/ObjectClassDefinitionRegistry.java
===================================================================
--- trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/ObjectClassDefinitionRegistry.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/clients/remoting/org.cishell.remoting/src/org/cishell/remoting/service/framework/ObjectClassDefinitionRegistry.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -19,7 +19,6 @@
 
 public interface ObjectClassDefinitionRegistry {
     public static String SERVICE_NAME = "ObjectClassDefinitionRegistry";
-    public static String SERVICE_METHODS = "*";
     
     public String getID(String ocdID);
     public String getName(String ocdID);

Modified: trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerAdapter.java
===================================================================
--- trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerAdapter.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerAdapter.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -22,12 +22,12 @@
  * 
  * @author Bruce Herr (bh...@bh...)
  */
-public abstract class ModelManagerAdapter implements ModelManagerListener {
+public class ModelManagerAdapter implements ModelManagerListener {
     /**
-     * @see org.cishell.app.service.modelmanager.ModelManagerListener#modelAdded(org.cishell.framework.datamodel.DataModel)
+     * @see org.cishell.app.service.modelmanager.ModelManagerListener#modelAdded(org.cishell.framework.datamodel.DataModel, java.lang.String)
      */
-    public void modelAdded(DataModel dm) {}
-
+    public void modelAdded(DataModel dm, String label) {}
+    
     /**
      * @see org.cishell.app.service.modelmanager.ModelManagerListener#modelRemoved(org.cishell.framework.datamodel.DataModel)
      */
@@ -37,4 +37,9 @@
      * @see org.cishell.app.service.modelmanager.ModelManagerListener#modelsSelected(org.cishell.framework.datamodel.DataModel[])
      */
     public void modelsSelected(DataModel[] dm) {}
+
+    /**
+     * @see org.cishell.app.service.modelmanager.ModelManagerListener#modelLabelChanged(org.cishell.framework.datamodel.DataModel, java.lang.String)
+     */
+    public void modelLabelChanged(DataModel dm, String label) {}
 }

Modified: trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerListener.java
===================================================================
--- trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerListener.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerListener.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -27,11 +27,20 @@
 	 * Notifies that a model has been added to the associated 
 	 * {@link ModelManagerService} 
 	 * 
-	 * @param dm The added {@link DataModel}
+	 * @param dm    The added {@link DataModel}
+     * @param label The label assigned to the datamodel
 	 */
-    public void modelAdded(DataModel dm);
+    public void modelAdded(DataModel dm, String label);
     
     /**
+     * Notifies that a model has had its label changed
+     * 
+     * @param dm    The DataModel
+     * @param label The new label
+     */
+    public void modelLabelChanged(DataModel dm, String label);
+    
+    /**
      * Notifies that a model has been removed from the associated
      * {@link ModelManagerService}
      * 

Modified: trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerService.java
===================================================================
--- trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerService.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/core/org.cishell.framework/src/org/cishell/app/service/modelmanager/ModelManagerService.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -80,4 +80,8 @@
      * @param listener The listener to be removed
      */
     public void removeModelManagerListener(ModelManagerListener listener);
+    
+    //TODO: Documentation
+    public String getLabel(DataModel dm);
+    public void setLabel(DataModel dm, String label);
 }

Modified: trunk/core/org.cishell.framework/src/org/cishell/service/conversion/Converter.java
===================================================================
--- trunk/core/org.cishell.framework/src/org/cishell/service/conversion/Converter.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/core/org.cishell.framework/src/org/cishell/service/conversion/Converter.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -16,6 +16,7 @@
 import java.util.Dictionary;
 
 import org.cishell.framework.algorithm.AlgorithmFactory;
+import org.cishell.framework.datamodel.DataModel;
 import org.osgi.framework.ServiceReference;
 
 /**
@@ -25,4 +26,6 @@
     public ServiceReference[] getConverterChain();
     public AlgorithmFactory getAlgorithmFactory();
     public Dictionary getProperties();
+    
+    public DataModel convert(DataModel dm);
 }

Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/modelmanager/ModelManagerServiceImpl.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/modelmanager/ModelManagerServiceImpl.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/modelmanager/ModelManagerServiceImpl.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -75,8 +75,8 @@
                         className = className.substring(0,className.lastIndexOf("Algorithm"));
                     }
                     
-                    if (className.endsWith("Plugin")) {
-                        className = className.substring(0,className.lastIndexOf("Plugin"));
+                    if (className.endsWith("Factory")) {
+                        className = className.substring(0,className.lastIndexOf("Factory"));
                     }
                 }           
                 label = className;  
@@ -90,7 +90,7 @@
         addModel(model, label);
         
         for (Iterator iter=listeners.iterator(); iter.hasNext();) {
-            ((ModelManagerListener) iter.next()).modelAdded(model);
+            ((ModelManagerListener) iter.next()).modelAdded(model, label);
         }
     }
 
@@ -145,7 +145,7 @@
 
 
     public void removeModel(DataModel model) {
-        String label = getLabelForModel(model);
+        String label = getLabel(model);
         
         labelToModelMap.remove(label);
         modelToLabelMap.remove(model);
@@ -176,9 +176,20 @@
         return (DataModel)labelToModelMap.get(label);
     }
     
-    private String getLabelForModel(DataModel model){
+    public String getLabel(DataModel model){
         return (String)modelToLabelMap.get(model);
     }
+    
+    public synchronized void setLabel(DataModel model, String label) {
+        label = findUniqueLabel(label);
+        
+        modelToLabelMap.put(model, label);
+        labelToModelMap.put(label, model);  
+        
+        for (Iterator iter=listeners.iterator(); iter.hasNext();) {
+            ((ModelManagerListener) iter.next()).modelLabelChanged(model, label);
+        }
+    }
 
     public DataModel[] getAllModels() {
         return (DataModel[]) models.toArray(new DataModel[]{});

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	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -14,15 +14,18 @@
 package org.cishell.reference.service.conversion;
 
 import java.util.Dictionary;
+import java.util.Enumeration;
 import java.util.Hashtable;
 
 import org.cishell.framework.CIShellContext;
 import org.cishell.framework.algorithm.Algorithm;
 import org.cishell.framework.algorithm.AlgorithmFactory;
 import org.cishell.framework.algorithm.AlgorithmProperty;
+import org.cishell.framework.datamodel.BasicDataModel;
 import org.cishell.framework.datamodel.DataModel;
 import org.cishell.service.conversion.Converter;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.metatype.MetaTypeProvider;
 
@@ -34,9 +37,11 @@
     private ServiceReference[] refs;
     private BundleContext bContext;
     private Dictionary props;
+    private CIShellContext ciContext;
     
-    public ConverterImpl(BundleContext bContext, ServiceReference[] refs) {
+    public ConverterImpl(BundleContext bContext, CIShellContext ciContext, ServiceReference[] refs) {
         this.bContext = bContext;
+        this.ciContext = ciContext;
         this.refs = refs;
         
         props = new Hashtable();
@@ -56,6 +61,39 @@
     }
     
     /**
+     * @see org.cishell.service.conversion.Converter#convert(org.cishell.framework.datamodel.DataModel)
+     */
+    public DataModel convert(DataModel inDM) {
+        DataModel[] dm = new DataModel[]{inDM};
+        
+        AlgorithmFactory factory = getAlgorithmFactory();
+        Algorithm alg = factory.createAlgorithm(dm, new Hashtable(), ciContext);
+
+        dm = alg.execute();
+        
+        Object outData = null;
+        if (dm != null && dm.length > 0) {
+            outData = dm[0].getData();
+        }
+        
+        if (outData != null) {
+            Dictionary props = inDM.getMetaData();
+            Dictionary newProps = new Hashtable();
+            
+            for (Enumeration e=props.keys(); e.hasMoreElements();) {
+                Object key = e.nextElement();
+                newProps.put(key, props.get(key));
+            }
+               
+            String outFormat = (String)getProperties().get(AlgorithmProperty.OUT_DATA);
+            return new BasicDataModel(newProps, outData, outFormat);
+        } else {
+            return null;
+        }
+    }
+    
+    
+    /**
      * @see org.cishell.service.conversion.Converter#getAlgorithmFactory()
      */
     public AlgorithmFactory getAlgorithmFactory() {
@@ -106,7 +144,7 @@
                     dm = alg.execute();
                 } else {
                     throw new RuntimeException("Missing subconverter: " 
-                            + refs[i].getProperty(AlgorithmProperty.LABEL));
+                            + refs[i].getProperty(Constants.SERVICE_PID));
                 }
             }
             

Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java	2006-07-24 22:32:30 UTC (rev 99)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java	2006-07-26 17:34:38 UTC (rev 100)
@@ -16,23 +16,17 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Hashtable;
 import java.util.List;
 
 import org.cishell.framework.CIShellContext;
-import org.cishell.framework.algorithm.Algorithm;
 import org.cishell.framework.algorithm.AlgorithmFactory;
 import org.cishell.framework.algorithm.AlgorithmProperty;
-import org.cishell.framework.datamodel.BasicDataModel;
 import org.cishell.framework.datamodel.DataModel;
 import org.cishell.service.conversion.Converter;
 import org.cishell.service.conversion.DataConversionService;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogService;
 
 public class DataConversionServiceImpl implements DataConversionService, AlgorithmProperty {
     private BundleContext bContext;
@@ -51,7 +45,8 @@
     public Converter[] findConverters(String inFormat, String outFormat) {
         try {
             String filter = "(&("+IN_DATA+"="+inFormat+") " +
-                              "("+OUT_DATA+"="+outFormat+"))";
+                              "("+OUT_DATA+"="+outFormat+")" +
+                              "(!("+REMOTEABLE+"=*)))";
 
             ServiceReference[] refs = bContext.getServiceReferences(
                     AlgorithmFactory.class.getName(), filter);
@@ -59,7 +54,7 @@
             if (refs != null && refs.length > 0) {
                 Converter[] converters = new Converter[refs.length];
                 for (int i=0; i < converters.length; i++) {
-                    converters[i] = new ConverterImpl(bContext, new ServiceReference[]{refs[i]});
+                    converters[i] = new ConverterImpl(bContext, ciContext, new ServiceReference[]{refs[i]});
                 }
                 
                 return converters;
@@ -67,7 +62,6 @@
                 return new Converter[0];
             }
         } catch (InvalidSyntaxException e) {
-            getLog().log(LogService.LOG_ERROR, "Incorrect Syntax", e);
             throw new RuntimeException(e);
         }
     }
@@ -80,63 +74,9 @@
         return findConverters(inFormat, outFormat);
     }
 
-    public DataModel convert(DataModel inDM, String outFormat) {
-        String inFormat = inDM.getFormat();
-        
-        Converter[] converters = new Converter[0];
-        if (inFormat != null) {
-            if (inFormat.equals(outFormat)) return inDM;
-            
-            converters = findConverters(inFormat, outFormat);
-        } else if (inDM.getData() != null) {
-            //try to find a converter that will convert the java object to
-            //the correct outFormat
-            
-            inFormat = inDM.getData().getClass().getName();
-            if (inFormat.equals(outFormat)) return inDM;
-            converters = findConverters(inFormat, outFormat);
-            
-            Class[] classes = inDM.getData().getClass().getClasses();
-            
-            for (int i=0; i < classes.length && converters.length == 0; i++) {
-                inFormat = classes[i].getName();
-                
-                if (inFormat.equals(outFormat)) return inDM;
-                
-                converters = findConverters(inFormat, outFormat);
-            }
-        }
-        
-        Object outData = null;
-        
-        if (converters.length > 0) {
-            DataModel[] dm = new DataModel[]{inDM};
-            
-            AlgorithmFactory factory = converters[0].getAlgorithmFactory();
-            Algorithm alg = factory.createAlgorithm(dm, new Hashtable(), ciContext);
-
-            dm = alg.execute();
-            
-            if (dm != null && dm.length > 0) {
-                outData = dm[0].getData();
-            }
-        }
-        
-        if (outData != null) {
-            Dictionary props = inDM.getMetaData();
-            Dictionary newProps = new Hashtable();
-            
-            for (Enumeration e=props.keys(); e.hasMoreElements();) {
-                Object key = e.nextElement();
-                newProps.put(key, props.get(key));
-            }
-                        
-            return new BasicDataModel(newProps, outData, outFormat);
-        } else {
-            return null;
-        }        
-    }
-    
+    /**
+     * @see org.cishell.service.conversion.DataConversionService#findConverters(org.cishell.framework.datamodel.DataModel, java.lang.String)
+     */
     public Converter[] findConverters(DataModel dm, String outFormat) {
         String format = dm.getFormat();
         
@@ -162,7 +102,21 @@
         return (Converter[]) list.toArray(new Converter[0]);
     }
     
-    private LogService getLog() {
-        return (LogService)ciContext.getService(LogService.class.getName());
+    /**
+     * @see org.cishell.service.conversion.DataConversionService#convert(org.cishell.framework.datamodel.DataModel, java.lang.String)
+     */
+    public DataModel convert(DataModel inDM, String outFormat) {
+        String inFormat = inDM.getFormat();
+        
+        if (inFormat != null && inFormat.equals(outFormat)) {
+            return inDM;
+        }
+
+        Converter[] converters = findConverters(inDM, outFormat);
+        if (converters.length > 0) {
+            inDM = converters[0].convert(inDM);
+        }
+        
+        return inDM;
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [107] trunk/examples/org.cishell.tests.alg1

From: <bh...@us...> - 2006-07-27 16:40:10

Revision: 107
Author:   bh2
Date:     2006-07-27 09:39:48 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/cishell/?rev=107&view=rev

Log Message:
-----------
* committing some sample bundles to see how an algorithm is integrated manually

Added Paths:
-----------
    trunk/examples/org.cishell.tests.alg1/.classpath
    trunk/examples/org.cishell.tests.alg1/.project
    trunk/examples/org.cishell.tests.alg1/.settings/
    trunk/examples/org.cishell.tests.alg1/.settings/org.eclipse.pde.core.prefs
    trunk/examples/org.cishell.tests.alg1/META-INF/
    trunk/examples/org.cishell.tests.alg1/META-INF/MANIFEST.MF
    trunk/examples/org.cishell.tests.alg1/OSGI-INF/
    trunk/examples/org.cishell.tests.alg1/OSGI-INF/algorithm1.properties
    trunk/examples/org.cishell.tests.alg1/OSGI-INF/algorithm2.properties
    trunk/examples/org.cishell.tests.alg1/OSGI-INF/component1.xml
    trunk/examples/org.cishell.tests.alg1/OSGI-INF/component2.xml
    trunk/examples/org.cishell.tests.alg1/OSGI-INF/l10n/
    trunk/examples/org.cishell.tests.alg1/OSGI-INF/l10n/bundle_en.properties
    trunk/examples/org.cishell.tests.alg1/OSGI-INF/metatype/
    trunk/examples/org.cishell.tests.alg1/OSGI-INF/metatype/METADATA.XML
    trunk/examples/org.cishell.tests.alg1/build.properties
    trunk/examples/org.cishell.tests.alg1/src/
    trunk/examples/org.cishell.tests.alg1/src/org/
    trunk/examples/org.cishell.tests.alg1/src/org/cishell/
    trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/
    trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/
    trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg.java
    trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg1Factory.java
    trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg2Factory.java
Added: trunk/examples/org.cishell.tests.alg1/.classpath
===================================================================
--- trunk/examples/org.cishell.tests.alg1/.classpath	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/.classpath	2006-07-27 16:39:48 UTC (rev 107)
@@ -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/examples/org.cishell.tests.alg1/.project
===================================================================
--- trunk/examples/org.cishell.tests.alg1/.project	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/.project	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.cishell.tests.alg1</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/examples/org.cishell.tests.alg1/.settings/org.eclipse.pde.core.prefs
===================================================================
--- trunk/examples/org.cishell.tests.alg1/.settings/org.eclipse.pde.core.prefs	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/.settings/org.eclipse.pde.core.prefs	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,4 @@
+#Fri Jun 16 15:07:20 EST 2006
+eclipse.preferences.version=1
+pluginProject.equinox=false
+pluginProject.extensions=false

Added: trunk/examples/org.cishell.tests.alg1/META-INF/MANIFEST.MF
===================================================================
--- trunk/examples/org.cishell.tests.alg1/META-INF/MANIFEST.MF	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/META-INF/MANIFEST.MF	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Alg1 Plug-in
+Bundle-SymbolicName: org.cishell.tests.alg1
+Bundle-Version: 0.0.1
+Bundle-Localization: plugin
+Service-Component: OSGI-INF/component1.xml, OSGI-INF/component2.xml
+X-AutoStart: true
+Import-Package: org.cishell.framework,
+ org.cishell.framework.algorithm,
+ org.cishell.framework.datamodel,
+ org.osgi.framework;version="1.3.0",
+ org.osgi.service.component;version="1.0.0",
+ org.osgi.service.log;version="1.3.0",
+ org.osgi.service.metatype;version="1.1.0"
+

Added: trunk/examples/org.cishell.tests.alg1/OSGI-INF/algorithm1.properties
===================================================================
--- trunk/examples/org.cishell.tests.alg1/OSGI-INF/algorithm1.properties	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/OSGI-INF/algorithm1.properties	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,6 @@
+menu_path=file/CIShell/additions
+label=Alg1
+description=My Algorithm!
+in_data=edu.uci.ics.jung.graph.Graph
+service.pid=org.cishell.tests.alg1.alg1
+remoteable=true

Added: trunk/examples/org.cishell.tests.alg1/OSGI-INF/algorithm2.properties
===================================================================
--- trunk/examples/org.cishell.tests.alg1/OSGI-INF/algorithm2.properties	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/OSGI-INF/algorithm2.properties	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,6 @@
+menu_path=file/CIShell/additions
+label=Alg2
+description=Muh Algorithm!
+in_data=java.lang.String
+service.pid=org.cishell.tests.alg1.alg2
+remoteable=true

Added: trunk/examples/org.cishell.tests.alg1/OSGI-INF/component1.xml
===================================================================
--- trunk/examples/org.cishell.tests.alg1/OSGI-INF/component1.xml	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/OSGI-INF/component1.xml	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="org.cishell.tests.alg1.component" immediate="false">
+	<implementation class="org.cishell.tests.alg1.Alg1Factory"/>
+	<properties entry="OSGI-INF/algorithm1.properties"/>
+	<reference name="LOG" interface="org.osgi.service.log.LogService"/>
+	<reference name="MTS" interface="org.osgi.service.metatype.MetaTypeService"/>
+	
+	<service>
+		<provide interface=
+			"org.cishell.framework.algorithm.AlgorithmFactory"/>
+	</service>
+</component>
\ No newline at end of file

Added: trunk/examples/org.cishell.tests.alg1/OSGI-INF/component2.xml
===================================================================
--- trunk/examples/org.cishell.tests.alg1/OSGI-INF/component2.xml	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/OSGI-INF/component2.xml	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="org.cishell.tests.alg1.component2" immediate="false">
+	<implementation class="org.cishell.tests.alg1.Alg2Factory"/>
+	<properties entry="OSGI-INF/algorithm2.properties"/>
+	<reference name="LOG" interface="org.osgi.service.log.LogService"/>
+	<reference name="MTS" interface="org.osgi.service.metatype.MetaTypeService"/>
+	
+	<service>
+		<provide interface=
+			"org.cishell.framework.algorithm.AlgorithmFactory"/>
+	</service>
+</component>
\ No newline at end of file

Added: trunk/examples/org.cishell.tests.alg1/OSGI-INF/l10n/bundle_en.properties
===================================================================
--- trunk/examples/org.cishell.tests.alg1/OSGI-INF/l10n/bundle_en.properties	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/OSGI-INF/l10n/bundle_en.properties	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,9 @@
+person=Person
+person_record=Person Record
+cn=Name
+sn=Sur Name
+seeAlso=See Also
+telNumber=Tel.
+sex=Sex
+male=Male
+female=Female

Added: trunk/examples/org.cishell.tests.alg1/OSGI-INF/metatype/METADATA.XML
===================================================================
--- trunk/examples/org.cishell.tests.alg1/OSGI-INF/metatype/METADATA.XML	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/OSGI-INF/metatype/METADATA.XML	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0">
+	<OCD name="%person" id="2.5.6.6"
+		 description="%person_record">
+		<AD name="%sex" id="2.5.4.12" type="Integer" default="1">
+			<Option label="%male" value="1" />
+			<Option label="%Female" value="0" />
+		</AD>
+		<AD name="%sn" id="2.5.4.4" type="String" default="" />
+		<AD name="%cn" id="2.5.4.3" type="String" default="" />
+		<AD name="%seeAlso" id="2.5.4.34" type="String" description="blah"
+			cardinality="8" default="http://www.google.com,
+			http://www.yahoo.com" />
+		<AD name="%telNumber" id="2.5.4.20" type="String" default="" />
+	</OCD>
+	<Designate pid="default.id">
+		<Object ocdref="2.5.6.6" />
+	</Designate>
+</metatype:MetaData>

Added: trunk/examples/org.cishell.tests.alg1/build.properties
===================================================================
--- trunk/examples/org.cishell.tests.alg1/build.properties	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/build.properties	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/

Added: trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg.java
===================================================================
--- trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg.java	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg.java	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,50 @@
+/* **************************************************************************** 
+ * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Apache License v2.0 which accompanies
+ * this distribution, and is available at:
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ * 
+ * Created on Jun 22, 2006 at Indiana University.
+ * 
+ * Contributors:
+ *     Indiana University - 
+ * ***************************************************************************/
+package org.cishell.tests.alg1;
+
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.datamodel.BasicDataModel;
+import org.cishell.framework.datamodel.DataModel;
+import org.cishell.framework.datamodel.DataModelProperty;
+import org.osgi.service.log.LogService;
+
+public class Alg implements Algorithm {
+    CIShellContext context;
+    Dictionary parameters;
+    
+    public Alg(CIShellContext context, Dictionary parameters) {
+        this.context = context;
+        this.parameters = parameters;
+    }
+
+    public DataModel[] execute() {
+        LogService log = (LogService)context.getService(LogService.class.getName());
+        
+        log.log(LogService.LOG_INFO, "My Parameters:");
+        for(Enumeration keys = parameters.keys();keys.hasMoreElements();) {
+            String key = (String)keys.nextElement();
+            log.log(LogService.LOG_INFO, key + "->" + parameters.get(key));
+        }
+        
+        Dictionary dict = new Hashtable();
+        dict.put(DataModelProperty.LABEL, "Weee!!!");
+        
+        return new DataModel[] {new BasicDataModel(dict, "Weee!!!", String.class.getName())};
+    }
+}
\ No newline at end of file

Added: trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg1Factory.java
===================================================================
--- trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg1Factory.java	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg1Factory.java	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,30 @@
+package org.cishell.tests.alg1;
+
+import java.util.Dictionary;
+
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmFactory;
+import org.cishell.framework.datamodel.DataModel;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.metatype.MetaTypeProvider;
+import org.osgi.service.metatype.MetaTypeService;
+
+public class Alg1Factory implements AlgorithmFactory {
+    private MetaTypeProvider provider;
+
+    protected void activate(ComponentContext ctxt) {
+        MetaTypeService mts = (MetaTypeService)ctxt.locateService("MTS");
+        provider = mts.getMetaTypeInformation(ctxt.getBundleContext().getBundle());       
+    }
+    protected void deactivate(ComponentContext ctxt) {
+        provider = null;
+    }
+
+    public Algorithm createAlgorithm(DataModel[] dm, Dictionary parameters, CIShellContext context) {
+        return new Alg(context, parameters);
+    }
+    public MetaTypeProvider createParameters(DataModel[] dm) {
+        return provider;
+    }
+}

Added: trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg2Factory.java
===================================================================
--- trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg2Factory.java	                        (rev 0)
+++ trunk/examples/org.cishell.tests.alg1/src/org/cishell/tests/alg1/Alg2Factory.java	2006-07-27 16:39:48 UTC (rev 107)
@@ -0,0 +1,30 @@
+package org.cishell.tests.alg1;
+
+import java.util.Dictionary;
+
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmFactory;
+import org.cishell.framework.datamodel.DataModel;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.metatype.MetaTypeProvider;
+import org.osgi.service.metatype.MetaTypeService;
+
+public class Alg2Factory implements AlgorithmFactory {
+    private MetaTypeProvider provider;
+
+    protected void activate(ComponentContext ctxt) {
+        MetaTypeService mts = (MetaTypeService)ctxt.locateService("MTS");
+        provider = mts.getMetaTypeInformation(ctxt.getBundleContext().getBundle());       
+    }
+    protected void deactivate(ComponentContext ctxt) {
+        provider = null;
+    }
+
+    public Algorithm createAlgorithm(DataModel[] dm, Dictionary parameters, CIShellContext context) {
+        return new Alg(context, parameters);
+    }
+    public MetaTypeProvider createParameters(DataModel[] dm) {
+        return provider;
+    }
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [102] trunk/libs/ksoap2lib

From: <bh...@us...> - 2006-07-27 10:16:06

Revision: 102
Author:   bh2
Date:     2006-07-26 13:12:33 -0700 (Wed, 26 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/cishell/?rev=102&view=rev

Log Message:
-----------
* added the ksoap2 lib bundle used by the 
reference remote architecture application

Added Paths:
-----------
    trunk/libs/ksoap2lib/.classpath
    trunk/libs/ksoap2lib/.project
    trunk/libs/ksoap2lib/.settings/
    trunk/libs/ksoap2lib/.settings/org.eclipse.pde.core.prefs
    trunk/libs/ksoap2lib/META-INF/
    trunk/libs/ksoap2lib/META-INF/MANIFEST.MF
    trunk/libs/ksoap2lib/build.properties
    trunk/libs/ksoap2lib/ksoap2-j2se-full-2.1.1.jar
Added: trunk/libs/ksoap2lib/.classpath
===================================================================
--- trunk/libs/ksoap2lib/.classpath	                        (rev 0)
+++ trunk/libs/ksoap2lib/.classpath	2006-07-26 20:12:33 UTC (rev 102)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" sourcepath="/ksoap2" kind="lib" path="ksoap2-j2se-full-2.1.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: trunk/libs/ksoap2lib/.project
===================================================================
--- trunk/libs/ksoap2lib/.project	                        (rev 0)
+++ trunk/libs/ksoap2lib/.project	2006-07-26 20:12:33 UTC (rev 102)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ksoap2lib</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/libs/ksoap2lib/.settings/org.eclipse.pde.core.prefs
===================================================================
--- trunk/libs/ksoap2lib/.settings/org.eclipse.pde.core.prefs	                        (rev 0)
+++ trunk/libs/ksoap2lib/.settings/org.eclipse.pde.core.prefs	2006-07-26 20:12:33 UTC (rev 102)
@@ -0,0 +1,4 @@
+#Wed Jul 05 13:21:56 EST 2006
+eclipse.preferences.version=1
+pluginProject.equinox=false
+pluginProject.extensions=false

Added: trunk/libs/ksoap2lib/META-INF/MANIFEST.MF
===================================================================
--- trunk/libs/ksoap2lib/META-INF/MANIFEST.MF	                        (rev 0)
+++ trunk/libs/ksoap2lib/META-INF/MANIFEST.MF	2006-07-26 20:12:33 UTC (rev 102)
@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ksoap2 library
+Bundle-SymbolicName: ksoap2lib
+Bundle-Version: 2.1.1
+Bundle-ClassPath: ksoap2-j2se-full-2.1.1.jar
+Bundle-Localization: plugin
+Export-Package: org.kobjects.base64,
+ org.kobjects.crypt,
+ org.kobjects.io,
+ org.kobjects.isodate,
+ org.kobjects.mime,
+ org.kobjects.pim,
+ org.kobjects.rss,
+ org.kobjects.util,
+ org.kobjects.xml,
+ org.kobjects.xmlrpc,
+ org.ksoap2,
+ org.ksoap2.serialization,
+ org.ksoap2.servlet,
+ org.ksoap2.transport,
+ org.kxml2.io,
+ org.kxml2.kdom,
+ org.kxml2.wap,
+ org.kxml2.wap.syncml,
+ org.kxml2.wap.wml,
+ org.kxml2.wap.wv,
+ org.xmlpull.v1
+Import-Package: javax.servlet,
+ javax.servlet.http

Added: trunk/libs/ksoap2lib/build.properties
===================================================================
--- trunk/libs/ksoap2lib/build.properties	                        (rev 0)
+++ trunk/libs/ksoap2lib/build.properties	2006-07-26 20:12:33 UTC (rev 102)
@@ -0,0 +1,4 @@
+bin.includes = META-INF/,\
+               ksoap2-j2se-full-2.1.1.jar,\
+               .
+src.includes = ksoap2-j2se-full-2.1.1.jar

Added: trunk/libs/ksoap2lib/ksoap2-j2se-full-2.1.1.jar
===================================================================
(Binary files differ)


Property changes on: trunk/libs/ksoap2lib/ksoap2-j2se-full-2.1.1.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Cishell-svn] SF.net SVN: cishell: [99] trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/log

From: <bh...@us...> - 2006-07-24 22:32:37

Revision: 99
Author:   bh2
Date:     2006-07-24 15:32:30 -0700 (Mon, 24 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/cishell/?rev=99&view=rev

Log Message:
-----------
did some slight code cleanup for the old cishell compatibility plugin

Modified Paths:
--------------
    trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/algorithm/AlgorithmAdapter.java
    trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/guibuilder/ParameterMapAdapter.java
    trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/log/OSGiLogListener.java
    trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/menu/AlgorithmAction.java
    trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/menu/MenuAdapter.java
Modified: trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/algorithm/AlgorithmAdapter.java
===================================================================
--- trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/algorithm/AlgorithmAdapter.java	2006-07-24 22:32:01 UTC (rev 98)
+++ trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/algorithm/AlgorithmAdapter.java	2006-07-24 22:32:30 UTC (rev 99)
@@ -78,26 +78,21 @@
     }
     
     protected void doDataModelConversion() {
-        String inDataText = (String) ref.getProperty(IN_DATA);
+        DataConversionService converter = (DataConversionService)
+            ciContext.getService(DataConversionService.class.getName());
         
+        String inDataText = (String) ref.getProperty(IN_DATA);
         if (inDataText != null && !inDataText.equals(NULL_DATA)) {
             String[] inData = inDataText.split(",");
             
             if (dm != null && inData.length == dm.length) {
                 for (int i=0; i < dm.length; i++) {
-                    dm[i] = convert(dm[i], inData[i]);
+                    dm[i] = converter.convert(dm[i], inData[i]);
                 }
             }
         }
     }
     
-    protected DataModel convert(DataModel dm, String outFormat) {
-        DataConversionService converter = (DataConversionService)
-            ciContext.getService(DataConversionService.class.getName());
-        
-        return converter.convert(dm, outFormat);
-    }
-    
     protected Dictionary makeDictionary() {
         if (parameterMap instanceof ParameterMapAdapter) {
             return ((ParameterMapAdapter) parameterMap).createDictionary();

Modified: trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/guibuilder/ParameterMapAdapter.java
===================================================================
--- trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/guibuilder/ParameterMapAdapter.java	2006-07-24 22:32:01 UTC (rev 98)
+++ trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/guibuilder/ParameterMapAdapter.java	2006-07-24 22:32:30 UTC (rev 99)
@@ -33,9 +33,10 @@
     protected ObjectClassDefinition ocd;
     
     public ParameterMapAdapter(MetaTypeProvider provider) {
+       ObjectClassDefinition ocd = null;
+       
        //String locale = Locale.getDefault().getDisplayName();
        //TODO: better locale matching
-       ObjectClassDefinition ocd = null;
        
        if (ocd == null) {
            String[] locales = provider.getLocales();
@@ -63,8 +64,9 @@
     }
     
     protected void createParameter(AttributeDefinition attr) {
+        int cardinality = attr.getCardinality();
+        
         //TODO: support for arbitrary additions of types
-        int cardinality = attr.getCardinality();
         if (cardinality == Integer.MAX_VALUE) {
             cardinality = 5;
         } else if (cardinality == Integer.MIN_VALUE) {
@@ -236,7 +238,7 @@
     }
     
     protected Object getValue(AttributeDefinition attr, Object value) {
-        //convert the speical types that aren't represented by the old GUI Builder
+        //convert the special types that aren't represented by the old GUI Builder
         switch (attr.getType()) {
         case AttributeDefinition.CHARACTER:
             if (value != null && value.toString().length() > 0) 

Modified: trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/log/OSGiLogListener.java
===================================================================
--- trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/log/OSGiLogListener.java	2006-07-24 22:32:01 UTC (rev 98)
+++ trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/log/OSGiLogListener.java	2006-07-24 22:32:30 UTC (rev 99)
@@ -25,10 +25,7 @@
 import edu.iu.iv.core.messaging.ConsoleLevel;
 import edu.iu.iv.core.messaging.ConsoleManager;
 
-/**
- * 
- * @author Bruce Herr
- */
+
 public class OSGiLogListener implements LogListener {
     private BundleContext bContext;
 
@@ -64,7 +61,6 @@
             level = ConsoleLevel.ALGORITHM_INFORMATION;
         }
         
-        
         if (goodMessage(entry.getMessage())) {
             console.print(entry.getMessage() + "\n", level);
         }

Modified: trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/menu/AlgorithmAction.java
===================================================================
--- trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/menu/AlgorithmAction.java	2006-07-24 22:32:01 UTC (rev 98)
+++ trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/menu/AlgorithmAction.java	2006-07-24 22:32:30 UTC (rev 99)
@@ -79,6 +79,7 @@
  
         console.printAlgorithmInformation(getText() + " was selected.\n");
 
+        //TODO: Print Algorithm Information
 //        String author = (String)ref.getProperty(AlgorithmProperty.AUTHOR);
 //        String citation = (String) ref.getProperty(AlgorithmProperty.CITATION);
 //        String docu = (String) ref.getProperty(AlgorithmProperty.DOCUMENTATION);
@@ -106,13 +107,12 @@
         if(models.size() == 0){
             boolean supports;
             try{
-            supports = supports(new BasicDataModel(null));
+                supports = supports(new BasicDataModel(null));
             } catch(NullPointerException e){
                 supports = false;
             }
             setEnabled(supports);
-        }
-        if(models.size() == 1){
+        } else if(models.size() == 1){
             setEnabled(supports((edu.iu.iv.core.datamodels.DataModel)models.toArray()[0]));
         } else {        
             CompositeDataModel composite = new BasicCompositeDataModel();
@@ -164,7 +164,7 @@
                     if (validator != null) {
                         List datamodels = new ArrayList();
                         
-                        for (Iterator i=cdm.iterator(); i.hasNext();) {
+                        for (Iterator i=cdm.iterator(); i.hasNext(); ) {
                             datamodels.add(new NewDataModelAdapter(
                                     (edu.iu.iv.core.datamodels.DataModel) i.next()));
                         }
@@ -207,6 +207,7 @@
     private Converter[] getDataConverters(String inFormat, String outFormat) {
         DataConversionService converter = (DataConversionService)
             ciContext.getService(DataConversionService.class.getName());
+
         return converter.findConverters(inFormat, outFormat);
     }
     

Modified: trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/menu/MenuAdapter.java
===================================================================
--- trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/menu/MenuAdapter.java	2006-07-24 22:32:01 UTC (rev 98)
+++ trunk/clients/old-cishell-compatibility/org.cishell.compatibility/src/org/cishell/compatibility/menu/MenuAdapter.java	2006-07-24 22:32:30 UTC (rev 99)
@@ -90,6 +90,22 @@
         }
     }
     
+    private class ContextListener implements ServiceListener {
+        public void serviceChanged(ServiceEvent event) {
+            switch (event.getType()) {
+            case ServiceEvent.REGISTERED:
+                makeMenuItem(event.getServiceReference());
+                break;
+            case ServiceEvent.UNREGISTERING:
+                removeMenuItem(event.getServiceReference());
+                break;
+            case ServiceEvent.MODIFIED:
+                updateMenuItem(event.getServiceReference());
+                break;
+            }
+        }
+    }
+    
     private void makeMenuItem(ServiceReference ref) {
         String path = (String)ref.getProperty(MENU_PATH);
         
@@ -132,7 +148,8 @@
     }
     
     private String getItemID(ServiceReference ref) {
-        return ref.getProperty(Constants.SERVICE_PID) + "-BID:" + ref.getBundle().getBundleId();
+        return ref.getProperty("PID:" + Constants.SERVICE_PID) + "-SID:" + 
+                                ref.getProperty(Constants.SERVICE_ID);
     }
     
     private MenuManager createMenu(String name, String id){
@@ -143,22 +160,6 @@
         return menu;
     }
     
-    private class ContextListener implements ServiceListener {
-        public void serviceChanged(ServiceEvent event) {
-            switch (event.getType()) {
-            case ServiceEvent.REGISTERED:
-                makeMenuItem(event.getServiceReference());
-                break;
-            case ServiceEvent.UNREGISTERING:
-                removeMenuItem(event.getServiceReference());
-                break;
-            case ServiceEvent.MODIFIED:
-                updateMenuItem(event.getServiceReference());
-                break;
-            }
-        }
-    }
-    
     private void updateMenuItem(ServiceReference ref) {
         Action item = (Action) algorithmToItemMap.get(getItemID(ref));
         


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Cishell-svn] SF.net SVN: cishell: [98] trunk/core/org.cishell.reference/src/org/cishell/reference/client/

From: <bh...@us...> - 2006-07-24 22:32:04

Revision: 98
Author:   bh2
Date:     2006-07-24 15:32:01 -0700 (Mon, 24 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/cishell/?rev=98&view=rev

Log Message:
-----------
* updated DataModel API (and fixed breakage caused by it)
* renamed client package to app

Removed Paths:
-------------
    trunk/core/org.cishell.reference/src/org/cishell/reference/client/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

<< < 1 .. 43 44 45 (Page 45 of 45)