You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2001/10/28 13:50:33 UTC
cvs commit: jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core AppLauncherImpl.java JesktopURLClassLoader.java LaunchableTargetHolder.java
hammant 01/10/28 04:50:33
Modified: apps/jesktop/src/java/org/apache/avalon/jesktop/core
AppLauncherImpl.java JesktopURLClassLoader.java
LaunchableTargetHolder.java
Log:
Jesktop updates for new SAR regime
Revision Changes Path
1.5 +7 -2 jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/AppLauncherImpl.java
Index: AppLauncherImpl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/AppLauncherImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AppLauncherImpl.java 2001/10/10 13:26:37 1.4
+++ AppLauncherImpl.java 2001/10/28 12:50:33 1.5
@@ -33,6 +33,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.net.URLStreamHandlerFactory;
import java.awt.BorderLayout;
import java.beans.PropertyVetoException;
@@ -42,7 +43,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class AppLauncherImpl extends AppBase implements AppLauncher, FrimbleCallback {
@@ -224,6 +225,10 @@
+ " can't launch as class "
+ launchableTarget.getClassName()
+ " missing from it's jar");
+ } catch (NoClassDefFoundError cndfe) {
+ cndfe.printStackTrace();
+ throw new JesktopLaunchException("App " + launchableTarget.getTargetName()
+ + " can't launch some dependant/parent class cannot be found. ");
} catch (IllegalAccessException iae) {
iae.printStackTrace();
} catch (InstantiationException ie) {
@@ -275,7 +280,7 @@
fa.setFrimble(frimble);
}
- frimble.pack();
+ //frimble.pack();
frimble.setVisible(true);
frimble.addFrimbleListener(mDesktopKernelImpl.getKernelFrimbleListener());
}
1.2 +2 -1 jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/JesktopURLClassLoader.java
Index: JesktopURLClassLoader.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/JesktopURLClassLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JesktopURLClassLoader.java 2001/09/08 17:42:53 1.1
+++ JesktopURLClassLoader.java 2001/10/28 12:50:33 1.2
@@ -10,6 +10,7 @@
import java.net.URLClassLoader;
import java.net.URL;
+import java.net.URLStreamHandlerFactory;
/**
@@ -17,7 +18,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class JesktopURLClassLoader extends URLClassLoader {
1.4 +10 -6 jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/LaunchableTargetHolder.java
Index: LaunchableTargetHolder.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/LaunchableTargetHolder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LaunchableTargetHolder.java 2001/10/21 22:45:33 1.3
+++ LaunchableTargetHolder.java 2001/10/28 12:50:33 1.4
@@ -25,13 +25,14 @@
import java.util.TreeSet;
import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URLStreamHandlerFactory;
/**
* Class LaunchableTargetHolder
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class LaunchableTargetHolder implements InstallationConfirmer, Serializable {
@@ -40,8 +41,11 @@
private int appSuffix = 1;
private HashMap targets = new HashMap();
private transient HashMap classloaders; // do not instantiate here - read up on transient.
- private transient ObjectRepository repository;
-
+ private transient ObjectRepository repository;
+
+ public LaunchableTargetHolder() {
+ }
+
private void makeNormalLaunchableTarget(final String targetName, final String className,
final String displayName, final boolean singleInstance) {
@@ -388,7 +392,7 @@
setBuiltInApps(launchableTargetHolder);
repository.put(KEY, launchableTargetHolder);
}
-
+
return launchableTargetHolder;
}
@@ -418,6 +422,6 @@
"Mimes And Extensions Management", true);
launchableTargetHolder.makeNormalLaunchableTarget(
SHUTDOWN_APP, "org.apache.avalon.jesktop.builtinapps.sys.ShutdownConfirmer", "Shutdown", true);
- }
-
+ }
+
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>