hammant 01/11/06 06:42:58
Modified: apps/jesktop/src/conf jesktop-assembly.xml
apps/jesktop/src/java/org/apache/avalon/jesktop/core
AppLauncherImpl.java ConfigManagerImpl.java
DesktopKernelImpl.java DesktopKernelImpl.xinfo
apps/jesktop/src/java/org/apache/avalon/jesktop/services
KernelConfigManager.java
apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze
WindozeWindowManager.java
WindozeWindowManager1.xinfo
WindozeWindowManager2.xinfo
Added: apps/jesktop/src/java/org/apache/avalon/jesktop/services
WindowManager.java
Log:
WindowManager moves to Apache
Revision Changes Path
1.6 +1 -1
jakarta-avalon-cornerstone/apps/jesktop/src/conf/jesktop-assembly.xml
Index: jesktop-assembly.xml
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/conf/jesktop-assembly.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jesktop-assembly.xml 2001/11/06 11:08:36 1.5
+++ jesktop-assembly.xml 2001/11/06 14:42:58 1.6
@@ -50,7 +50,7 @@
<block class="org.apache.avalon.jesktop.core.DesktopKernelImpl"
name="jesktop-kernel" >
<provide name="cfg-mgr"
role="org.apache.avalon.jesktop.services.KernelConfigManager"/>
- <provide name="jesktop-windowmanager"
role="org.jesktop.api.WindowManager"/>
+ <provide name="jesktop-windowmanager"
role="org.apache.avalon.jesktop.services.WindowManager"/>
<provide name="objectstorage"
role="org.apache.avalon.cornerstone.services.store.Store"/>
<provide name="thread-manager"
role="org.apache.avalon.cornerstone.services.threads.ThreadManager"/>
</block>
1.7 +3 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AppLauncherImpl.java 2001/11/05 13:55:53 1.6
+++ AppLauncherImpl.java 2001/11/06 14:42:58 1.7
@@ -8,7 +8,6 @@
package org.apache.avalon.jesktop.core;
import org.jesktop.api.AppLauncher;
-import org.jesktop.api.WindowManager;
import org.jesktop.api.ImageRepository;
import org.jesktop.api.Decorator;
import org.jesktop.api.JesktopLaunchException;
@@ -27,6 +26,7 @@
import org.apache.avalon.jesktop.builtinapps.config.ControlPanel;
import org.apache.avalon.jesktop.services.DesktopKernelService;
import org.apache.avalon.jesktop.services.KernelConfigManager;
+import org.apache.avalon.jesktop.services.WindowManager;
import javax.swing.JComponent;
import javax.swing.JLabel;
@@ -46,12 +46,12 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class AppLauncherImpl extends AppBase implements AppLauncher,
FrimbleCallback {
private static int TEMPAPPSUFFIX = 1;
- private WindowManager mWindowManager;
+ private org.apache.avalon.jesktop.services.WindowManager mWindowManager;
private LaunchableTargetHolder mLaunchableTargetHolder;
private DesktopKernelService mDesktopKernelService;
private Vector mLaunchedTargets;
1.9 +2 -2
jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/ConfigManagerImpl.java
Index: ConfigManagerImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/ConfigManagerImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ConfigManagerImpl.java 2001/11/06 11:08:36 1.8
+++ ConfigManagerImpl.java 2001/11/06 14:42:58 1.9
@@ -12,7 +12,6 @@
import org.jesktop.config.ConfigManager;
import org.jesktop.config.Configlet;
-import org.jesktop.api.WindowManager;
import org.jesktop.config.ObjConfiglet;
import org.jesktop.config.XMLConfiglet;
import org.jesktop.launchable.ConfigletLaunchableTarget;
@@ -36,6 +35,7 @@
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.jesktop.services.KernelConfigManager;
import org.apache.avalon.jesktop.services.DesktopKernelService;
+import org.apache.avalon.jesktop.services.WindowManager;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -57,7 +57,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class ConfigManagerImpl extends AbstractLoggable
implements Block, KernelConfigManager, ConfigManager,
Contextualizable, Composable, Configurable, Initializable {
1.13 +13 -5
jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/DesktopKernelImpl.java
Index: DesktopKernelImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/DesktopKernelImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DesktopKernelImpl.java 2001/11/06 11:08:36 1.12
+++ DesktopKernelImpl.java 2001/11/06 14:42:58 1.13
@@ -26,9 +26,9 @@
import org.apache.avalon.jesktop.builtinapps.sys.ErrorApp;
import org.apache.avalon.jesktop.services.DesktopKernelService;
import org.apache.avalon.jesktop.services.KernelConfigManager;
+import org.apache.avalon.jesktop.services.WindowManager;
import org.apache.avalon.excalibur.thread.ThreadPool;
import org.apache.avalon.excalibur.proxy.DynamicProxy;
-import org.jesktop.api.*;
import org.jesktop.appsupport.DropAware;
import org.jesktop.appsupport.DraggedItem;
import org.jesktop.appsupport.ContentViewer;
@@ -43,6 +43,14 @@
import org.jesktop.launchable.DecoratorLaunchableTarget;
import org.jesktop.launchable.ConfigletLaunchableTarget;
import org.jesktop.launchable.LaunchableTarget;
+import org.jesktop.api.DesktopKernel;
+import org.jesktop.api.Decorator;
+import org.jesktop.api.ImageRepository;
+import org.jesktop.api.AppLauncher;
+import org.jesktop.api.AppInstaller;
+import org.jesktop.api.LaunchedTarget;
+import org.jesktop.api.JesktopPackagingException;
+import org.jesktop.api.JesktopLaunchException;
import javax.swing.JComponent;
import java.util.Vector;
@@ -72,7 +80,7 @@
private static boolean LOG = true;
private final Vector launchedTargets = new Vector();
private LaunchableTargetHolder launchableTargetHolder;
- private AppInstaller mAppInstallerProxy;
+ private AppInstaller mAppInstallerProxy;
private AppInstallerImpl mAppInstaller;
private AppLauncher mAppLauncherProxy, mAppLauncher;
private ImageRepository mImageRepository;
@@ -231,7 +239,7 @@
getLogger().info("Jesktop Kernel Initialized");
try {
- mWindowManager = (WindowManager)
mCompManager.lookup(WindowManager.ROLE);
+ mWindowManager = (WindowManager)
mCompManager.lookup(WindowManager.class.getName());
mJesktopStore = (Store) mCompManager.lookup(Store.ROLE);
mThreadManager = (ThreadManager)
mCompManager.lookup(ThreadManager.ROLE);
mConfigManager = (KernelConfigManager)
mCompManager.lookup(KernelConfigManager.class.getName());
@@ -786,7 +794,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
private class KernelLaunchedTarget extends LaunchedTargetImpl {
@@ -847,7 +855,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
private class KernelFrimbleListener extends FrimbleAdapter {
1.8 +1 -1
jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/DesktopKernelImpl.xinfo
Index: DesktopKernelImpl.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/core/DesktopKernelImpl.xinfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DesktopKernelImpl.xinfo 2001/11/06 11:08:36 1.7
+++ DesktopKernelImpl.xinfo 2001/11/06 14:42:58 1.8
@@ -10,7 +10,7 @@
</services>
<dependencies>
<dependency>
- <service name="org.jesktop.api.WindowManager"
version="1.0"/>
+ <service
name="org.apache.avalon.jesktop.services.WindowManager" version="1.0"/>
</dependency>
<dependency>
<service
name="org.apache.avalon.cornerstone.services.store.Store" version="1.0"/>
1.3 +0 -1
jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/services/KernelConfigManager.java
Index: KernelConfigManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/services/KernelConfigManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KernelConfigManager.java 2001/11/05 20:12:59 1.2
+++ KernelConfigManager.java 2001/11/06 14:42:58 1.3
@@ -7,7 +7,6 @@
*/
package org.apache.avalon.jesktop.services;
-import org.jesktop.api.WindowManager;
import org.jesktop.api.Decorator;
import org.jesktop.api.DesktopKernel;
import org.jesktop.config.ConfigManager;
1.1
jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/services/WindowManager.java
Index: WindowManager.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.jesktop.services;
import org.jesktop.frimble.Frimble;
import org.jesktop.appsupport.DraggedItem;
import org.jesktop.config.PersistableConfig;
import org.jesktop.api.DesktopKernel;
import org.jesktop.api.LaunchedTarget;
import org.w3c.dom.Document;
import java.awt.Point;
import java.beans.PropertyChangeListener;
/**
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version 1.0
*/
public interface WindowManager extends PropertyChangeListener {
/**
* Method close
*
*
*/
void close();
/**
* Desktop is occasionally going to ask the kernel to launch an
* app.
*
* @param dk
*/
void setKernelCallback(DesktopKernel dk);
/**
* Each implemntation of WindowManager may have a different concept of
* containment for apps. Some will use JFrames, some may use
JInternalFrames
* Others may be custom displays.....
* e.g. Imagine a JTabbedPane with each tab being an app, right click on
the
* itslef for close/minimise actions...... nahh!
*
* @param title
*
* @return
*/
Frimble createFrimble(String title);
/**
* Method renderDragRepresentation
*
*
* @param draggedItem
* @param pt
*
*/
void renderDragRepresentation(DraggedItem draggedItem, Point pt);
/**
* Method addLaunchedTarget
*
*
* @param launchedTarget
*
*/
void addLaunchedTarget(LaunchedTarget launchedTarget);
/**
* Method removeLaunchedTarget
*
*
* @param launchedTarget
*
*/
void removeLaunchedTarget(LaunchedTarget launchedTarget);
/**
* Method updateComponentTreeUI
*
*
*/
void updateComponentTreeUI();
/**
* Method setPersistableConfig
*
*
* @param persistableConfig
*
*/
void setPersistableConfig(PersistableConfig persistableConfig);
/**
* Method setConfig
*
*
* @param configPath
* @param config
*
*/
void setConfig(String configPath, Document config);
/**
* Method initializeView
*
*
*/
void initializeView();
}
1.4 +1 -2
jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze/WindozeWindowManager.java
Index: WindozeWindowManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze/WindozeWindowManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WindozeWindowManager.java 2001/10/23 08:54:34 1.3
+++ WindozeWindowManager.java 2001/11/06 14:42:58 1.4
@@ -15,7 +15,6 @@
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.jesktop.JesktopConstants;
-import org.jesktop.api.WindowManager;
import org.jesktop.api.DesktopKernel;
import org.jesktop.api.ImageRepository;
import org.jesktop.api.LaunchedTarget;
@@ -65,7 +64,7 @@
*
*/
public abstract class WindozeWindowManager extends AbstractLoggable
- implements Block, WindowManager, Composable, Contextualizable,
+ implements Block, org.apache.avalon.jesktop.services.WindowManager,
Composable, Contextualizable,
Initializable, PropertyChangeListener {
protected JPanel bottomBar;
1.4 +1 -1
jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze/WindozeWindowManager1.xinfo
Index: WindozeWindowManager1.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze/WindozeWindowManager1.xinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WindozeWindowManager1.xinfo 2001/11/06 11:08:36 1.3
+++ WindozeWindowManager1.xinfo 2001/11/06 14:42:58 1.4
@@ -6,6 +6,6 @@
</block>
<!-- services that are offered by this block -->
<services>
- <service name="org.jesktop.api.WindowManager" version="1.0"/>
+ <service
name="org.apache.avalon.jesktop.services.WindowManager" version="1.0"/>
</services>
</blockinfo>
1.4 +1 -1
jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze/WindozeWindowManager2.xinfo
Index: WindozeWindowManager2.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/jesktop/src/java/org/apache/avalon/jesktop/windowmanagers/windoze/WindozeWindowManager2.xinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WindozeWindowManager2.xinfo 2001/11/06 11:08:36 1.3
+++ WindozeWindowManager2.xinfo 2001/11/06 14:42:58 1.4
@@ -6,6 +6,6 @@
</block>
<!-- services that are offered by this block -->
<services>
- <service name="org.jesktop.api.WindowManager" version="1.0"/>
+ <service
name="org.apache.avalon.jesktop.services.WindowManager" version="1.0"/>
</services>
</blockinfo>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
