[Sblim-commit] ecute/Plugin/com/ibm/ecute/utils Utils.java,1.1,1.2 Constants.java,1.8,1.9

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12154/Plugin/com/ibm/ecute/utils

Modified Files:
	Utils.java Constants.java 
Log Message:
Version 2.1 alpha 6d
Edit qualifiers dialog with main functionality added to RSA

Index: Utils.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils/Utils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Utils.java	6 Jul 2004 13:16:03 -0000	1.1
+++ Utils.java	10 May 2005 09:11:53 -0000	1.2
@@ -79,13 +79,20 @@
 			try {
 
 				//Create directory
-
 				 (new File("jacob")).mkdir();
 
-				ZipFile zipFile = new ZipFile("jacobBin_17.zip");
+				 String zipFileName = null;
+				 File zipfile = new File("jacob/jacob_18.zip");
+				 if(zipfile.exists()){
+				 	zipFileName = "jacob/jacob_18.zip";
+				 } else {
+				 	zipFileName = "jacob/jacobBin_17.zip";	
+				 }
+				 
+				 ZipFile zipFile = new ZipFile(zipFileName);
 
+				 
 				//Recover jar file
-
 				ZipEntry entry = zipFile.getEntry("jacob.jar");
 
 				InputStream in = zipFile.getInputStream(entry);
@@ -103,7 +110,6 @@
 				out.close();
 
 				//Recover DLL
-
 				entry = zipFile.getEntry("jacob.dll");
 
 				in = zipFile.getInputStream(entry);
@@ -118,7 +124,6 @@
 				out.close();
 
 				//Recover license.txt
-
 				entry = zipFile.getEntry("LICENSE.TXT");
 
 				in = zipFile.getInputStream(entry);
@@ -132,14 +137,18 @@
 				in.close();
 				out.close();
 
-				return "New version of Jacob detected: the necessary files were extracted\r\nPlease, close restart the tooling";
+				// the '$' at the beginning of the return string is used to determine the type
+				// of the show dialog
+				return "$New version of Jacob detected: the necessary files were extracted\r\n" +
+						"Please, restart this eCUTE tool now";
 
 			} catch (Exception e) {
 				e.printStackTrace();
-				return "Error: Some of the files associated to the JACOB proyect are missing\n"
+				return "Error: Some files associated to the JACOB project are missing\n"
 					+ "\n"
-					+ "Please get the file at http://danadler.com/jacob/jacobBin_17.zip "
-					+ "and place it in the install directory"
+					+ "Please get the file at\n" 
+					+ "http://easynews.dl.sourceforge.net/sourceforge/jacob-project/jacob_18.zip \n"
+					+ "and place it in the install directory\n"
 					+ "\n"
 					+ "Use the URL shortcut saved in the install directory\n";
 			}

Index: Constants.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils/Constants.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Constants.java	8 Apr 2005 09:11:19 -0000	1.8
+++ Constants.java	10 May 2005 09:11:53 -0000	1.9
@@ -22,8 +22,8 @@
 
 public class Constants {
 	
-    public static final String pluginVersion="2.1 alpha 6";
-	public static final String toolName="ECUTE";
+    public static final String pluginVersion="2.1 alpha 6d";
+	public static final String toolName="eCUTE";
 	public static final String qualifiersFileName="QualifiersList.txt";
 	
 	public static final String cimMOFInputPackageName = "CIMMOFInput";