Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIkuo Yamasaki2007-01-31 21:03:48 +0000
committerIkuo Yamasaki2007-01-31 21:03:48 +0000
commit890e275fd94e3a5246e201b13e170e317e723b93 (patch)
treebf85bfb863098fab71e57fbe26aaaafaa502286d /bundles/org.eclipse.equinox.frameworkadmin
parentecf67689371fc1eabd6d5f1c687051009327e413 (diff)
downloadrt.equinox.p2-890e275fd94e3a5246e201b13e170e317e723b93.tar.gz
rt.equinox.p2-890e275fd94e3a5246e201b13e170e317e723b93.tar.xz
rt.equinox.p2-890e275fd94e3a5246e201b13e170e317e723b93.zip
Minor bug fix to printout the location if a manifest cannot be opened.
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin')
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/Utils.java28
2 files changed, 17 insertions, 13 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF
index 478b0cf63..b7765423f 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.frameworkadmin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: FrameworkAdmin Service IF
Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Import-Package: org.osgi.framework;version="1.3.0",
diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/Utils.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/Utils.java
index aaa4efc97..3f8bf6469 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/Utils.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/frameworkadmin/utils/Utils.java
@@ -155,14 +155,6 @@ public class Utils {
return ret;
}
- public static String getPathFromClause(String clause) {
- if (clause == null)
- return null;
- if (clause.indexOf(";") != -1)
- clause = clause.substring(0, clause.indexOf(";"));
- return clause.trim();
- }
-
public static String[] getClauses(String header) {
StringTokenizer token = new StringTokenizer(header, ",");
List list = new LinkedList();
@@ -187,10 +179,12 @@ public class Utils {
String value = attributes.getValue(name);
return value == null ? null : value.trim();
} catch (MalformedURLException e1) {
- // TODO Auto-generated catch block
+ // TODO log
+ System.err.println("location=" + location);
e1.printStackTrace();
} catch (IOException e) {
- // TODO Auto-generated catch block
+ // TODO log
+ System.err.println("location=" + location);
e.printStackTrace();
}
return null;
@@ -216,15 +210,25 @@ public class Utils {
// System.out.println("");
return table;
} catch (MalformedURLException e1) {
- // TODO Auto-generated catch block
+ // TODO log
+ System.err.println("location=" + location);
e1.printStackTrace();
} catch (IOException e) {
- // TODO Auto-generated catch block
+ // TODO log
+ System.err.println("location=" + location);
e.printStackTrace();
}
return null;
}
+ public static String getPathFromClause(String clause) {
+ if (clause == null)
+ return null;
+ if (clause.indexOf(";") != -1)
+ clause = clause.substring(0, clause.indexOf(";"));
+ return clause.trim();
+ }
+
public static String getRelativePath(File target, File from) {
String targetPath = Utils.replaceAll(target.getAbsolutePath(), File.separator, PATH_SEP);

Back to the top