diff --git a/src/antidote/org/apache/tools/ant/gui/About.java b/src/antidote/org/apache/tools/ant/gui/About.java index 3b63bbf52..9eec0af5e 100644 --- a/src/antidote/org/apache/tools/ant/gui/About.java +++ b/src/antidote/org/apache/tools/ant/gui/About.java @@ -54,6 +54,7 @@ package org.apache.tools.ant.gui; import org.apache.tools.ant.gui.util.WindowUtils; +import org.apache.tools.ant.gui.core.AppContext; import javax.swing.*; import java.io.IOException; import java.util.*; diff --git a/src/antidote/org/apache/tools/ant/gui/Antidote.java b/src/antidote/org/apache/tools/ant/gui/Antidote.java index 85bf5e5a2..219a76b66 100644 --- a/src/antidote/org/apache/tools/ant/gui/Antidote.java +++ b/src/antidote/org/apache/tools/ant/gui/Antidote.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui; - +import org.apache.tools.ant.gui.core.*; import javax.swing.*; import java.awt.BorderLayout; import java.awt.Dimension; diff --git a/src/antidote/org/apache/tools/ant/gui/Main.java b/src/antidote/org/apache/tools/ant/gui/Main.java index 9f6edf827..308d71ba8 100644 --- a/src/antidote/org/apache/tools/ant/gui/Main.java +++ b/src/antidote/org/apache/tools/ant/gui/Main.java @@ -52,6 +52,8 @@ * . */ package org.apache.tools.ant.gui; +import org.apache.tools.ant.gui.core.*; +import org.apache.tools.ant.gui.util.XMLHelper; import org.apache.tools.ant.gui.command.LoadFileCmd; import javax.swing.*; import java.awt.BorderLayout; diff --git a/src/antidote/org/apache/tools/ant/gui/ProjectDocument.java b/src/antidote/org/apache/tools/ant/gui/ProjectDocument.java deleted file mode 100644 index b962e3d8e..000000000 --- a/src/antidote/org/apache/tools/ant/gui/ProjectDocument.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (c) 1999, 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, if - * any, must include the following acknowlegement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowlegement may appear in the software itself, - * if and wherever such third-party acknowlegements normally appear. - * - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache" - * nor may "Apache" appear in their names without prior written - * permission of the Apache Group. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - */ -package org.apache.tools.ant.gui; -import org.apache.tools.ant.Project; -import javax.swing.text.DefaultStyledDocument; -import java.io.*; - -/** - * Provides a Document view on the Project XML source. - * NB: This class currently looks nothing like it should. - * Rather than just rendering a copy of the build file contents, - * this class should implement a true document model, representing - * the true XML sturcture of the build file. This is just a temporary - * implementation. - * - * @version $Revision$ - * @author Simeon Fitch - */ -public class ProjectDocument extends DefaultStyledDocument { - - // This is what the real constructor needs to look like... - //public ProjectDocument(Project project) { - //} - - public ProjectDocument(File f) { - // XXX stubbed method. will go away. - try { - // XXX hack hack hack.... - Reader reader = new BufferedReader(new FileReader(f)); - char[] buf = new char[1024]; - int num = 0; - while((num = reader.read(buf)) >= 0) { - insertString(getLength(), new String(buf, 0, num), null); - } - - } - catch(Exception ex) { - // XXX log me. - ex.printStackTrace(); - } - } - -} diff --git a/src/antidote/org/apache/tools/ant/gui/acs/ACSBeanDescriptor.java b/src/antidote/org/apache/tools/ant/gui/acs/ACSBeanDescriptor.java index 28710388f..3cf39633d 100644 --- a/src/antidote/org/apache/tools/ant/gui/acs/ACSBeanDescriptor.java +++ b/src/antidote/org/apache/tools/ant/gui/acs/ACSBeanDescriptor.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.gui.acs; -import org.apache.tools.ant.gui.ResourceManager; +import org.apache.tools.ant.gui.core.ResourceManager; import java.beans.*; /** diff --git a/src/antidote/org/apache/tools/ant/gui/acs/BaseBeanInfo.java b/src/antidote/org/apache/tools/ant/gui/acs/BaseBeanInfo.java index 9d75c7daa..bd0473fbf 100644 --- a/src/antidote/org/apache/tools/ant/gui/acs/BaseBeanInfo.java +++ b/src/antidote/org/apache/tools/ant/gui/acs/BaseBeanInfo.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.gui.acs; -import org.apache.tools.ant.gui.ResourceManager; +import org.apache.tools.ant.gui.core.ResourceManager; import org.apache.tools.ant.gui.customizer.DynamicCustomizer; import java.beans.*; import javax.swing.ImageIcon; diff --git a/src/antidote/org/apache/tools/ant/gui/ProjectTreeModel.java b/src/antidote/org/apache/tools/ant/gui/acs/ElementTreeModel.java similarity index 95% rename from src/antidote/org/apache/tools/ant/gui/ProjectTreeModel.java rename to src/antidote/org/apache/tools/ant/gui/acs/ElementTreeModel.java index 047ec61ca..64932786b 100644 --- a/src/antidote/org/apache/tools/ant/gui/ProjectTreeModel.java +++ b/src/antidote/org/apache/tools/ant/gui/acs/ElementTreeModel.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.acs; import javax.swing.tree.DefaultTreeModel; @@ -64,8 +64,8 @@ import org.apache.tools.ant.gui.acs.ACSProjectElement; * * @version $Revision$ * @author Simeon H.K. Fitch */ -public class ProjectTreeModel extends DefaultTreeModel { - public ProjectTreeModel(ACSProjectElement root) { +public class ElementTreeModel extends DefaultTreeModel { + public ElementTreeModel(ACSProjectElement root) { super(root); } } diff --git a/src/antidote/org/apache/tools/ant/gui/ElementSelectionModel.java b/src/antidote/org/apache/tools/ant/gui/acs/ElementTreeSelectionModel.java similarity index 96% rename from src/antidote/org/apache/tools/ant/gui/ElementSelectionModel.java rename to src/antidote/org/apache/tools/ant/gui/acs/ElementTreeSelectionModel.java index b2530da26..df9cbea12 100644 --- a/src/antidote/org/apache/tools/ant/gui/ElementSelectionModel.java +++ b/src/antidote/org/apache/tools/ant/gui/acs/ElementTreeSelectionModel.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.acs; import org.apache.tools.ant.gui.acs.ACSElement; import org.apache.tools.ant.gui.acs.ACSTargetElement; @@ -65,12 +65,12 @@ import java.util.*; * @version $Revision$ * @author Simeon Fitch */ -class ElementSelectionModel extends DefaultTreeSelectionModel { +public class ElementTreeSelectionModel extends DefaultTreeSelectionModel { /** * Default ctor. * */ - public ElementSelectionModel() { + public ElementTreeSelectionModel() { setSelectionMode(DISCONTIGUOUS_TREE_SELECTION); } diff --git a/src/antidote/org/apache/tools/ant/gui/command/AboutCmd.java b/src/antidote/org/apache/tools/ant/gui/command/AboutCmd.java index 8c7eab9d6..d5fe216c7 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/AboutCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/AboutCmd.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; import org.apache.tools.ant.gui.About; import java.awt.Window; import java.awt.event.WindowEvent; diff --git a/src/antidote/org/apache/tools/ant/gui/command/AbstractCommand.java b/src/antidote/org/apache/tools/ant/gui/command/AbstractCommand.java index b116cbcdd..28949af5e 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/AbstractCommand.java +++ b/src/antidote/org/apache/tools/ant/gui/command/AbstractCommand.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** diff --git a/src/antidote/org/apache/tools/ant/gui/command/BuildCmd.java b/src/antidote/org/apache/tools/ant/gui/command/BuildCmd.java index bde2b5b4f..4b7e564a8 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/BuildCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/BuildCmd.java @@ -52,8 +52,8 @@ q * * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; -import org.apache.tools.ant.gui.ProjectProxy; +import org.apache.tools.ant.gui.core.AppContext; +import org.apache.tools.ant.gui.core.ProjectProxy; import org.apache.tools.ant.gui.event.ErrorEvent; /** diff --git a/src/antidote/org/apache/tools/ant/gui/command/ChangeLookAndFeelCmd.java b/src/antidote/org/apache/tools/ant/gui/command/ChangeLookAndFeelCmd.java index b3939c88d..05e7f9ce7 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/ChangeLookAndFeelCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/ChangeLookAndFeelCmd.java @@ -52,8 +52,8 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; -import org.apache.tools.ant.gui.ChangeLookAndFeel; +import org.apache.tools.ant.gui.core.AppContext; +import org.apache.tools.ant.gui.util.ChangeLookAndFeel; /** * ChangeLookAndFeel command. diff --git a/src/antidote/org/apache/tools/ant/gui/command/CloseCmd.java b/src/antidote/org/apache/tools/ant/gui/command/CloseCmd.java index 33b6cecf9..3d161041e 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/CloseCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/CloseCmd.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; import org.apache.tools.ant.gui.event.ProjectClosedEvent; diff --git a/src/antidote/org/apache/tools/ant/gui/command/Command.java b/src/antidote/org/apache/tools/ant/gui/command/Command.java index 47a6093f1..abaa0bd01 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/Command.java +++ b/src/antidote/org/apache/tools/ant/gui/command/Command.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; diff --git a/src/antidote/org/apache/tools/ant/gui/command/DisplayErrorCmd.java b/src/antidote/org/apache/tools/ant/gui/command/DisplayErrorCmd.java index 14546dcb2..b38efccea 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/DisplayErrorCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/DisplayErrorCmd.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; import org.apache.tools.ant.gui.util.StackFrame; import javax.swing.*; import java.awt.FlowLayout; diff --git a/src/antidote/org/apache/tools/ant/gui/command/EmacsNotifyCmd.java b/src/antidote/org/apache/tools/ant/gui/command/EmacsNotifyCmd.java index b43d902fb..7b0162508 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/EmacsNotifyCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/EmacsNotifyCmd.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; import org.apache.tools.ant.gui.ide.EmacsNotifier; /** diff --git a/src/antidote/org/apache/tools/ant/gui/command/ExitCmd.java b/src/antidote/org/apache/tools/ant/gui/command/ExitCmd.java index 77f6ae612..fc885d0e2 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/ExitCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/ExitCmd.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; import org.apache.tools.ant.gui.util.WindowUtils; import java.awt.Window; diff --git a/src/antidote/org/apache/tools/ant/gui/command/LoadFileCmd.java b/src/antidote/org/apache/tools/ant/gui/command/LoadFileCmd.java index 9637e11c5..521a85439 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/LoadFileCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/LoadFileCmd.java @@ -52,8 +52,8 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; -import org.apache.tools.ant.gui.ProjectProxy; +import org.apache.tools.ant.gui.core.AppContext; +import org.apache.tools.ant.gui.core.ProjectProxy; import org.apache.tools.ant.gui.event.ErrorEvent; import java.io.File; import java.io.IOException; diff --git a/src/antidote/org/apache/tools/ant/gui/command/NoOpCmd.java b/src/antidote/org/apache/tools/ant/gui/command/NoOpCmd.java index d0673d571..370f682d8 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/NoOpCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/NoOpCmd.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** * NoOp command. diff --git a/src/antidote/org/apache/tools/ant/gui/command/OpenCmd.java b/src/antidote/org/apache/tools/ant/gui/command/OpenCmd.java index e34727c3c..44e5bb1a6 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/OpenCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/OpenCmd.java @@ -52,9 +52,9 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; import org.apache.tools.ant.gui.event.OpenRequestEvent; -import org.apache.tools.ant.gui.XMLFileFilter; +import org.apache.tools.ant.gui.core.XMLFileFilter; import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; import java.io.File; diff --git a/src/antidote/org/apache/tools/ant/gui/command/SaveAsCmd.java b/src/antidote/org/apache/tools/ant/gui/command/SaveAsCmd.java index dbeaead2a..a8a28e3a6 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/SaveAsCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/SaveAsCmd.java @@ -52,13 +52,13 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; -import org.apache.tools.ant.gui.ProjectProxy; +import org.apache.tools.ant.gui.core.AppContext; +import org.apache.tools.ant.gui.core.ProjectProxy; import org.apache.tools.ant.gui.event.ErrorEvent; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import org.apache.tools.ant.gui.XMLFileFilter; +import org.apache.tools.ant.gui.core.XMLFileFilter; import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; import javax.swing.JOptionPane; diff --git a/src/antidote/org/apache/tools/ant/gui/command/SaveCmd.java b/src/antidote/org/apache/tools/ant/gui/command/SaveCmd.java index bcad9e2e9..7466f3705 100644 --- a/src/antidote/org/apache/tools/ant/gui/command/SaveCmd.java +++ b/src/antidote/org/apache/tools/ant/gui/command/SaveCmd.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.command; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** * Command to execute the saving of the current build file. diff --git a/src/antidote/org/apache/tools/ant/gui/ActionManager.java b/src/antidote/org/apache/tools/ant/gui/core/ActionManager.java similarity index 81% rename from src/antidote/org/apache/tools/ant/gui/ActionManager.java rename to src/antidote/org/apache/tools/ant/gui/core/ActionManager.java index 3479880f5..c8a43ae2f 100644 --- a/src/antidote/org/apache/tools/ant/gui/ActionManager.java +++ b/src/antidote/org/apache/tools/ant/gui/core/ActionManager.java @@ -1,50 +1,3 @@ -/* - * The Apache Software License, Version 1.1 - * - * Copyright (C) 2000 The Apache Software Foundation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modifica- - * tion, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. The end-user documentation included with the redistribution, if any, must - * include the following acknowledgment: "This product includes software - * developed by the Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, if - * and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Ant" and "Apache Software Foundation" must not be used to - * endorse or promote products derived from this software without prior - * written permission. For written permission, please contact - * apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", nor may - * "Apache" appear in their name, without prior written permission of the - * Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- - * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * This software consists of voluntary contributions made by many individuals - * on behalf of the Apache Software Foundation. For more information on the - * Apache Software Foundation, please see . - * - */ - /* * The Apache Software License, Version 1.1 * @@ -98,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.core; import org.apache.tools.ant.gui.event.*; import org.apache.tools.ant.gui.command.Command; diff --git a/src/antidote/org/apache/tools/ant/gui/AntAction.java b/src/antidote/org/apache/tools/ant/gui/core/AntAction.java similarity index 99% rename from src/antidote/org/apache/tools/ant/gui/AntAction.java rename to src/antidote/org/apache/tools/ant/gui/core/AntAction.java index 266cf5f58..69f2e2b7c 100644 --- a/src/antidote/org/apache/tools/ant/gui/AntAction.java +++ b/src/antidote/org/apache/tools/ant/gui/core/AntAction.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.core; import javax.swing.*; import java.net.URL; diff --git a/src/antidote/org/apache/tools/ant/gui/AntModule.java b/src/antidote/org/apache/tools/ant/gui/core/AntModule.java similarity index 99% rename from src/antidote/org/apache/tools/ant/gui/AntModule.java rename to src/antidote/org/apache/tools/ant/gui/core/AntModule.java index 9f06f99b1..4af4cc7a1 100644 --- a/src/antidote/org/apache/tools/ant/gui/AntModule.java +++ b/src/antidote/org/apache/tools/ant/gui/core/AntModule.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.core; import javax.swing.JComponent; import javax.swing.BorderFactory; diff --git a/src/antidote/org/apache/tools/ant/gui/AppContext.java b/src/antidote/org/apache/tools/ant/gui/core/AppContext.java similarity index 99% rename from src/antidote/org/apache/tools/ant/gui/AppContext.java rename to src/antidote/org/apache/tools/ant/gui/core/AppContext.java index b2a47ff36..b3c3867f2 100644 --- a/src/antidote/org/apache/tools/ant/gui/AppContext.java +++ b/src/antidote/org/apache/tools/ant/gui/core/AppContext.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.core; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.gui.event.*; import java.awt.Frame; @@ -81,7 +81,6 @@ public class AppContext { /** The current data model. */ private ProjectProxy _project = null; - public AppContext(Frame parent) { _parentFrame = parent; // Add the build listener for dispatching BuildEvent diff --git a/src/antidote/org/apache/tools/ant/gui/BuildEventForwarder.java b/src/antidote/org/apache/tools/ant/gui/core/BuildEventForwarder.java similarity index 99% rename from src/antidote/org/apache/tools/ant/gui/BuildEventForwarder.java rename to src/antidote/org/apache/tools/ant/gui/core/BuildEventForwarder.java index 288b7e930..13eb5c87e 100644 --- a/src/antidote/org/apache/tools/ant/gui/BuildEventForwarder.java +++ b/src/antidote/org/apache/tools/ant/gui/core/BuildEventForwarder.java @@ -51,7 +51,8 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.core; + import org.apache.tools.ant.gui.event.*; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.BuildEvent; diff --git a/src/antidote/org/apache/tools/ant/gui/EventResponder.java b/src/antidote/org/apache/tools/ant/gui/core/EventResponder.java similarity index 98% rename from src/antidote/org/apache/tools/ant/gui/EventResponder.java rename to src/antidote/org/apache/tools/ant/gui/core/EventResponder.java index 804198e00..a6b16c1b2 100644 --- a/src/antidote/org/apache/tools/ant/gui/EventResponder.java +++ b/src/antidote/org/apache/tools/ant/gui/core/EventResponder.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.core; import org.apache.tools.ant.gui.event.*; import org.apache.tools.ant.gui.command.*; @@ -66,7 +66,7 @@ import javax.swing.*; * @version $Revision$ * @author Simeon Fitch */ -class EventResponder { +public class EventResponder { /** The application context. */ private AppContext _context = null; diff --git a/src/antidote/org/apache/tools/ant/gui/EventToActionMapper.java b/src/antidote/org/apache/tools/ant/gui/core/EventToActionMapper.java similarity index 98% rename from src/antidote/org/apache/tools/ant/gui/EventToActionMapper.java rename to src/antidote/org/apache/tools/ant/gui/core/EventToActionMapper.java index 5b6a631d6..437b1058d 100644 --- a/src/antidote/org/apache/tools/ant/gui/EventToActionMapper.java +++ b/src/antidote/org/apache/tools/ant/gui/core/EventToActionMapper.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.core; import java.util.*; /** @@ -71,8 +71,11 @@ class EventToActionMapper { private Map _disableOn = new HashMap(); + /** + * Defaul ctor. + * + */ public EventToActionMapper() { - } /** @@ -85,7 +88,6 @@ class EventToActionMapper { putAction(action, action.getDisableOnEvents(), _disableOn); } - /** * For the given action store it in the event type mapping * for each of the given types. @@ -107,8 +109,6 @@ class EventToActionMapper { values.add(action); } } - - /** * For the given event change the state of any actions that * have been registered as needing a transition as a result of @@ -142,6 +142,4 @@ class EventToActionMapper { action.setEnabled(state); } } - - } diff --git a/src/antidote/org/apache/tools/ant/gui/ProjectProxy.java b/src/antidote/org/apache/tools/ant/gui/core/ProjectProxy.java similarity index 96% rename from src/antidote/org/apache/tools/ant/gui/ProjectProxy.java rename to src/antidote/org/apache/tools/ant/gui/core/ProjectProxy.java index 245f095d4..a02c72a47 100644 --- a/src/antidote/org/apache/tools/ant/gui/ProjectProxy.java +++ b/src/antidote/org/apache/tools/ant/gui/core/ProjectProxy.java @@ -51,9 +51,12 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.core; + import org.apache.tools.ant.*; +import org.apache.tools.ant.gui.*; import org.apache.tools.ant.gui.event.*; +import org.apache.tools.ant.gui.acs.ElementTreeSelectionModel; import org.apache.tools.ant.gui.acs.*; import java.io.File; import java.io.Writer; @@ -86,7 +89,7 @@ public class ProjectProxy { /** The current thread executing a build. */ private Thread _buildThread = null; /** The selection model for selected targets. */ - private ElementSelectionModel _selections = null; + private ElementTreeSelectionModel _selections = null; /** * File loading ctor. @@ -106,7 +109,7 @@ public class ProjectProxy { */ private void loadProject() throws IOException, SAXException { _project = ACSFactory.getInstance().load(_file); - _selections = new ElementSelectionModel(); + _selections = new ElementTreeSelectionModel(); _selections.addTreeSelectionListener(new SelectionForwarder()); } @@ -174,7 +177,7 @@ public class ProjectProxy { */ public TreeModel getTreeModel() { if(_project != null) { - return new ProjectTreeModel(_project); + return new ElementTreeModel(_project); } return null; } @@ -184,7 +187,7 @@ public class ProjectProxy { * * @return Selection model. */ - public ElementSelectionModel getTreeSelectionModel() { + public ElementTreeSelectionModel getTreeSelectionModel() { return _selections; } diff --git a/src/antidote/org/apache/tools/ant/gui/ResourceManager.java b/src/antidote/org/apache/tools/ant/gui/core/ResourceManager.java similarity index 92% rename from src/antidote/org/apache/tools/ant/gui/ResourceManager.java rename to src/antidote/org/apache/tools/ant/gui/core/ResourceManager.java index 1e16c01bb..3538d6dd7 100644 --- a/src/antidote/org/apache/tools/ant/gui/ResourceManager.java +++ b/src/antidote/org/apache/tools/ant/gui/core/ResourceManager.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.core; import java.util.*; import java.text.MessageFormat; @@ -67,6 +67,18 @@ import java.io.File; * @author Simeon H.K. Fitch */ public class ResourceManager { + + /** Path to default resources. */ + private static final String RESOURCE_PKG = + "org.apache.tools.ant.gui.resources"; + /** Path to default resources. */ + private static final String DEF_PROPERTIES = + RESOURCE_PKG + ".antidote"; + + /** Image path. */ + private static final String IMG_PATH = + "/" + RESOURCE_PKG.replace('.', '/'); + /** Resources to reference. */ private ResourceBundle _resources = null; @@ -75,7 +87,7 @@ public class ResourceManager { * */ public ResourceManager() { - this("org.apache.tools.ant.gui.resources.antidote"); + this(DEF_PROPERTIES); } /** @@ -186,7 +198,7 @@ public class ResourceManager { ImageIcon icon = null; - URL location = getClass().getResource("resources/" + fileName); + URL location = getClass().getResource(IMG_PATH + "/" + fileName); if(location != null) { icon = new ImageIcon(location); diff --git a/src/antidote/org/apache/tools/ant/gui/XMLFileFilter.java b/src/antidote/org/apache/tools/ant/gui/core/XMLFileFilter.java similarity index 98% rename from src/antidote/org/apache/tools/ant/gui/XMLFileFilter.java rename to src/antidote/org/apache/tools/ant/gui/core/XMLFileFilter.java index 6c289cd95..68e1802f5 100644 --- a/src/antidote/org/apache/tools/ant/gui/XMLFileFilter.java +++ b/src/antidote/org/apache/tools/ant/gui/core/XMLFileFilter.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.core; import javax.swing.filechooser.FileFilter; import java.io.File; diff --git a/src/antidote/org/apache/tools/ant/gui/customizer/DynamicCustomizer.java b/src/antidote/org/apache/tools/ant/gui/customizer/DynamicCustomizer.java index 8b4cad807..85727cdf9 100644 --- a/src/antidote/org/apache/tools/ant/gui/customizer/DynamicCustomizer.java +++ b/src/antidote/org/apache/tools/ant/gui/customizer/DynamicCustomizer.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.gui.customizer; -import org.apache.tools.ant.gui.LabelFieldGBC; +import org.apache.tools.ant.gui.util.LabelFieldGBC; import java.lang.reflect.*; import java.beans.*; import javax.swing.*; diff --git a/src/antidote/org/apache/tools/ant/gui/event/AntBuildEvent.java b/src/antidote/org/apache/tools/ant/gui/event/AntBuildEvent.java index 46f49ad43..114c90812 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/AntBuildEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/AntBuildEvent.java @@ -56,7 +56,7 @@ import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.gui.util.StackFrame; import org.apache.tools.ant.gui.command.Command; import org.apache.tools.ant.gui.command.NoOpCmd; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; import java.util.EventObject; /** @@ -78,7 +78,7 @@ public class AntBuildEvent extends AntEvent { * @param context application context. */ public AntBuildEvent(AppContext context, - BuildEvent buildEvent, BuildEventType type) { + BuildEvent buildEvent, BuildEventType type) { super(context); _buildEvent = buildEvent; _type = type; diff --git a/src/antidote/org/apache/tools/ant/gui/event/AntEvent.java b/src/antidote/org/apache/tools/ant/gui/event/AntEvent.java index 24829662a..a74b12672 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/AntEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/AntEvent.java @@ -54,7 +54,7 @@ package org.apache.tools.ant.gui.event; import org.apache.tools.ant.gui.command.Command; import org.apache.tools.ant.gui.command.NoOpCmd; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; import java.util.EventObject; /** diff --git a/src/antidote/org/apache/tools/ant/gui/event/BuildFinishedEvent.java b/src/antidote/org/apache/tools/ant/gui/event/BuildFinishedEvent.java index dc78ecb5c..a748acf32 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/BuildFinishedEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/BuildFinishedEvent.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.gui.event; import org.apache.tools.ant.BuildEvent; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** diff --git a/src/antidote/org/apache/tools/ant/gui/event/BuildStartedEvent.java b/src/antidote/org/apache/tools/ant/gui/event/BuildStartedEvent.java index cbf1abd2c..ef3785298 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/BuildStartedEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/BuildStartedEvent.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.gui.event; import org.apache.tools.ant.BuildEvent; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** diff --git a/src/antidote/org/apache/tools/ant/gui/event/ElementSelectionEvent.java b/src/antidote/org/apache/tools/ant/gui/event/ElementSelectionEvent.java index 5e3b5eb15..8ba418372 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/ElementSelectionEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/ElementSelectionEvent.java @@ -55,7 +55,7 @@ package org.apache.tools.ant.gui.event; import org.apache.tools.ant.gui.acs.*; import org.apache.tools.ant.gui.command.Command; import org.apache.tools.ant.gui.command.DisplayErrorCmd; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** * Event indicating that the current set of selected targets has changed. diff --git a/src/antidote/org/apache/tools/ant/gui/event/ErrorEvent.java b/src/antidote/org/apache/tools/ant/gui/event/ErrorEvent.java index 5dd46ab11..e52a46e00 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/ErrorEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/ErrorEvent.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.event; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; import org.apache.tools.ant.gui.command.DisplayErrorCmd; import org.apache.tools.ant.gui.command.Command; import org.apache.tools.ant.gui.util.StackFrame; diff --git a/src/antidote/org/apache/tools/ant/gui/event/NewProjectEvent.java b/src/antidote/org/apache/tools/ant/gui/event/NewProjectEvent.java index 32bc0dfb2..517eca663 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/NewProjectEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/NewProjectEvent.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.event; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** * Event providing notification of a change in the current project. diff --git a/src/antidote/org/apache/tools/ant/gui/event/NullSelectionEvent.java b/src/antidote/org/apache/tools/ant/gui/event/NullSelectionEvent.java index 5e1c4d1d6..3219077cf 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/NullSelectionEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/NullSelectionEvent.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.gui.event; import org.apache.tools.ant.gui.acs.ACSElement; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** * Event fired when no elements are selected. diff --git a/src/antidote/org/apache/tools/ant/gui/event/OpenRequestEvent.java b/src/antidote/org/apache/tools/ant/gui/event/OpenRequestEvent.java index eafb47a68..e6fa6e00a 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/OpenRequestEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/OpenRequestEvent.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.event; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; import org.apache.tools.ant.gui.command.Command; import org.apache.tools.ant.gui.command.LoadFileCmd; diff --git a/src/antidote/org/apache/tools/ant/gui/event/ProjectClosedEvent.java b/src/antidote/org/apache/tools/ant/gui/event/ProjectClosedEvent.java index f904a954b..0a365695f 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/ProjectClosedEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/ProjectClosedEvent.java @@ -52,7 +52,7 @@ * . */ package org.apache.tools.ant.gui.event; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** diff --git a/src/antidote/org/apache/tools/ant/gui/event/ProjectSelectionEvent.java b/src/antidote/org/apache/tools/ant/gui/event/ProjectSelectionEvent.java index aaf1cf917..4e0d29871 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/ProjectSelectionEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/ProjectSelectionEvent.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.gui.event; import org.apache.tools.ant.gui.acs.ACSElement; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** * Event fired when the project node is selected. diff --git a/src/antidote/org/apache/tools/ant/gui/event/PropertySelectionEvent.java b/src/antidote/org/apache/tools/ant/gui/event/PropertySelectionEvent.java index 5ee5a4b6c..3428c72e2 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/PropertySelectionEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/PropertySelectionEvent.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.gui.event; import org.apache.tools.ant.gui.acs.ACSElement; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** * Event fired when one or more tasks are selected. diff --git a/src/antidote/org/apache/tools/ant/gui/event/TargetSelectionEvent.java b/src/antidote/org/apache/tools/ant/gui/event/TargetSelectionEvent.java index 400a269d4..7be609fc2 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/TargetSelectionEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/TargetSelectionEvent.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.gui.event; import org.apache.tools.ant.gui.acs.ACSElement; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** * Event fired when one or more targets are selected. diff --git a/src/antidote/org/apache/tools/ant/gui/event/TaskSelectionEvent.java b/src/antidote/org/apache/tools/ant/gui/event/TaskSelectionEvent.java index 7a418e3a5..76d84f104 100644 --- a/src/antidote/org/apache/tools/ant/gui/event/TaskSelectionEvent.java +++ b/src/antidote/org/apache/tools/ant/gui/event/TaskSelectionEvent.java @@ -53,7 +53,7 @@ */ package org.apache.tools.ant.gui.event; import org.apache.tools.ant.gui.acs.ACSElement; -import org.apache.tools.ant.gui.AppContext; +import org.apache.tools.ant.gui.core.AppContext; /** * Event fired when one or more tasks are selected. diff --git a/src/antidote/org/apache/tools/ant/gui/TargetMonitor.java b/src/antidote/org/apache/tools/ant/gui/modules/TargetMonitor.java similarity index 96% rename from src/antidote/org/apache/tools/ant/gui/TargetMonitor.java rename to src/antidote/org/apache/tools/ant/gui/modules/TargetMonitor.java index 1df69c228..8a8866f5f 100644 --- a/src/antidote/org/apache/tools/ant/gui/TargetMonitor.java +++ b/src/antidote/org/apache/tools/ant/gui/modules/TargetMonitor.java @@ -51,9 +51,11 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.modules; +import org.apache.tools.ant.gui.core.*; import org.apache.tools.ant.gui.event.*; import org.apache.tools.ant.gui.acs.ACSTargetElement; +import org.apache.tools.ant.gui.acs.ElementTreeSelectionModel; import javax.swing.*; import javax.swing.plaf.ComponentUI; import javax.swing.text.Document; @@ -140,7 +142,8 @@ public class TargetMonitor extends AntModule { ProjectProxy p = getContext().getProject(); if(p != null) { - ElementSelectionModel selections = p.getTreeSelectionModel(); + ElementTreeSelectionModel selections = + p.getTreeSelectionModel(); ACSTargetElement[] targets = selections.getSelectedTargets(); if(targets != null && targets.length > 0) { StringBuffer buf = new StringBuffer(); diff --git a/src/antidote/org/apache/tools/ant/gui/Console.java b/src/antidote/org/apache/tools/ant/gui/modules/console/BuildConsole.java similarity index 98% rename from src/antidote/org/apache/tools/ant/gui/Console.java rename to src/antidote/org/apache/tools/ant/gui/modules/console/BuildConsole.java index 35feadfd2..9f1a145b6 100644 --- a/src/antidote/org/apache/tools/ant/gui/Console.java +++ b/src/antidote/org/apache/tools/ant/gui/modules/console/BuildConsole.java @@ -51,7 +51,10 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.modules; + +import org.apache.tools.ant.gui.core.AntModule; +import org.apache.tools.ant.gui.core.AppContext; import org.apache.tools.ant.gui.event.*; import javax.swing.*; import javax.swing.plaf.ComponentUI; @@ -68,7 +71,7 @@ import java.util.EventObject; * @version $Revision$ * @author Simeon Fitch */ -public class Console extends AntModule { +public class BuildConsole extends AntModule { /** Area where messages are printed. */ private JTextPane _text = null; /** Selection of logging levels. */ @@ -79,7 +82,7 @@ public class Console extends AntModule { /** * Default ctor. */ - public Console() { + public BuildConsole() { } diff --git a/src/antidote/org/apache/tools/ant/gui/LogLevelEnum.java b/src/antidote/org/apache/tools/ant/gui/modules/console/LogLevelEnum.java similarity index 99% rename from src/antidote/org/apache/tools/ant/gui/LogLevelEnum.java rename to src/antidote/org/apache/tools/ant/gui/modules/console/LogLevelEnum.java index 0dd09c4a6..7fd413056 100644 --- a/src/antidote/org/apache/tools/ant/gui/LogLevelEnum.java +++ b/src/antidote/org/apache/tools/ant/gui/modules/console/LogLevelEnum.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.modules; /** * Enumeration class of the different log levels. diff --git a/src/antidote/org/apache/tools/ant/gui/ProjectNavigator.java b/src/antidote/org/apache/tools/ant/gui/modules/edit/ElementNavigator.java similarity index 94% rename from src/antidote/org/apache/tools/ant/gui/ProjectNavigator.java rename to src/antidote/org/apache/tools/ant/gui/modules/edit/ElementNavigator.java index ea31f63f6..722c3223f 100644 --- a/src/antidote/org/apache/tools/ant/gui/ProjectNavigator.java +++ b/src/antidote/org/apache/tools/ant/gui/modules/edit/ElementNavigator.java @@ -51,7 +51,8 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.modules.edit; +import org.apache.tools.ant.gui.core.*; import org.apache.tools.ant.gui.event.*; import javax.swing.*; import java.awt.GridLayout; @@ -61,12 +62,12 @@ import java.awt.event.MouseEvent; import java.util.EventObject; /** - * AntEditor for displaying the project target in a + * Module for navigating build file elemenets. * * @version $Revision$ * @author Simeon Fitch */ -class ProjectNavigator extends AntModule { +public class ElementNavigator extends AntModule { /** Navigation via a tree widget. */ private JTree _tree = null; @@ -75,7 +76,7 @@ class ProjectNavigator extends AntModule { * Default ctor. * */ - public ProjectNavigator() { + public ElementNavigator() { } /** @@ -91,7 +92,7 @@ class ProjectNavigator extends AntModule { _tree = new JTree(); _tree.setModel(null); - _tree.setCellRenderer(new AntTreeCellRenderer()); + _tree.setCellRenderer(new ElementTreeCellRenderer()); _tree.addMouseListener(new PopupHandler()); JScrollPane scroller = new JScrollPane(_tree); add(scroller); @@ -159,7 +160,7 @@ class ProjectNavigator extends AntModule { ActionManager mgr = getContext().getActions(); JPopupMenu menu = mgr.createPopup( getContext().getResources().getStringArray( - ProjectNavigator.class, "popupActions")); + ElementNavigator.class, "popupActions")); menu.show((JComponent)e.getSource(), e.getX(), e.getY()); } } diff --git a/src/antidote/org/apache/tools/ant/gui/AntTreeCellRenderer.java b/src/antidote/org/apache/tools/ant/gui/modules/edit/ElementTreeCellRenderer.java similarity index 97% rename from src/antidote/org/apache/tools/ant/gui/AntTreeCellRenderer.java rename to src/antidote/org/apache/tools/ant/gui/modules/edit/ElementTreeCellRenderer.java index f954915de..896cda7c2 100644 --- a/src/antidote/org/apache/tools/ant/gui/AntTreeCellRenderer.java +++ b/src/antidote/org/apache/tools/ant/gui/modules/edit/ElementTreeCellRenderer.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.modules.edit; import org.apache.tools.ant.gui.acs.ACSElement; import javax.swing.tree.DefaultTreeCellRenderer; @@ -67,7 +67,7 @@ import java.beans.*; * @version $Revision$ * @author Simeon Fitch */ -public class AntTreeCellRenderer extends DefaultTreeCellRenderer { +public class ElementTreeCellRenderer extends DefaultTreeCellRenderer { public Component getTreeCellRendererComponent(JTree tree, Object value, diff --git a/src/antidote/org/apache/tools/ant/gui/PropertyEditor.java b/src/antidote/org/apache/tools/ant/gui/modules/edit/PropertyEditor.java similarity index 98% rename from src/antidote/org/apache/tools/ant/gui/PropertyEditor.java rename to src/antidote/org/apache/tools/ant/gui/modules/edit/PropertyEditor.java index 05583c826..75ec97d27 100644 --- a/src/antidote/org/apache/tools/ant/gui/PropertyEditor.java +++ b/src/antidote/org/apache/tools/ant/gui/modules/edit/PropertyEditor.java @@ -51,9 +51,10 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.modules.edit; import org.apache.tools.ant.gui.customizer.DynamicCustomizer; +import org.apache.tools.ant.gui.core.*; import org.apache.tools.ant.gui.acs.*; import org.apache.tools.ant.gui.event.*; import javax.swing.*; diff --git a/src/antidote/org/apache/tools/ant/gui/resources/action.properties b/src/antidote/org/apache/tools/ant/gui/resources/action.properties index 4743c5684..a38cb2b08 100644 --- a/src/antidote/org/apache/tools/ant/gui/resources/action.properties +++ b/src/antidote/org/apache/tools/ant/gui/resources/action.properties @@ -1,12 +1,12 @@ # Define the primary menubar items. -menus=File, Build, Options, Help +menus=File, Build, Help # Declare the list of known actions. actions=\ open, save, saveas, close, exit, about, \ newTarget, newTask, newProperty \ startBuild, stopBuild, \ - notifyEmacs, changeLookAndFeel + notifyEmacs # Configure the decalred actions. @@ -132,17 +132,3 @@ newProperty.enableOn=\ newProperty.disableOn=\ org.apache.tools.ant.gui.event.PropertySelectionEvent, \ org.apache.tools.ant.gui.event.NullSelectionEvent - -changeLookAndFeel.name=Look and Feel... -changeLookAndFeel.shortDescription=Change the Look and Feel -changeLookAndFeel.parentMenuName=Options -changeLookAndFeel.command=org.apache.tools.ant.gui.command.ChangeLookAndFeelCmd -changeLookAndFeel.enabled=true -changeLookAndFeel.separator=true - -notifyEmacs.name=Notify Emacs -notifyEmacs.shortDescription=\ - Send a notification event to Emacs on build errors -notifyEmacs.parentMenuName=Options -notifyEmacs.toggle=true -notifyEmacs.command=org.apache.tools.ant.gui.command.EmacsNotifyCmd diff --git a/src/antidote/org/apache/tools/ant/gui/resources/antidote.properties b/src/antidote/org/apache/tools/ant/gui/resources/antidote.properties index 877ac3435..b1ef8d67a 100644 --- a/src/antidote/org/apache/tools/ant/gui/resources/antidote.properties +++ b/src/antidote/org/apache/tools/ant/gui/resources/antidote.properties @@ -8,33 +8,33 @@ # Configure the modules that appear on the right of the UI. org.apache.tools.ant.gui.Antidote.right.modules=\ - org.apache.tools.ant.gui.PropertyEditor + org.apache.tools.ant.gui.modules.edit.PropertyEditor # Configure the modules that appear on the left of the UI. org.apache.tools.ant.gui.Antidote.left.modules=\ - org.apache.tools.ant.gui.ProjectNavigator + org.apache.tools.ant.gui.modules.edit.ElementNavigator # Configure the modules that appear on the bottom of the UI. org.apache.tools.ant.gui.Antidote.bottom.modules=\ - org.apache.tools.ant.gui.Console + org.apache.tools.ant.gui.modules.console.BuildConsole # Configure the modules that appear on the top of the UI. org.apache.tools.ant.gui.Antidote.top.modules=\ - org.apache.tools.ant.gui.TargetMonitor + org.apache.tools.ant.gui.modules.TargetMonitor -org.apache.tools.ant.gui.PropertyEditor.name=Properties +org.apache.tools.ant.gui.modules.PropertyEditor.name=Properties -org.apache.tools.ant.gui.ProjectNavigator.name=Project -org.apache.tools.ant.gui.ProjectNavigator.popupActions=\ +org.apache.tools.ant.gui.modules.ElementNavigator.name=Project +org.apache.tools.ant.gui.modules.ElementNavigator.popupActions=\ newTarget, newTask, newProperty -org.apache.tools.ant.gui.TargetMonitor.name=Selected Target(s) -org.apache.tools.ant.gui.TargetMonitor.defText=[none] +org.apache.tools.ant.gui.modules.TargetMonitor.name=Selected Target(s) +org.apache.tools.ant.gui.modules.TargetMonitor.defText=[none] -org.apache.tools.ant.gui.Console.name=Console -org.apache.tools.ant.gui.Console.logLevel=Log message level: +org.apache.tools.ant.gui.modules.Console.name=Console +org.apache.tools.ant.gui.modules.Console.logLevel=Log message level: -org.apache.tools.ant.gui.XMLFileFilter.description=XML Files +org.apache.tools.ant.gui.core.XMLFileFilter.description=XML Files org.apache.tools.ant.gui.command.LoadFileCmd.noFile=The file "{0}" was not found. org.apache.tools.ant.gui.command.LoadFileCmd.loadError=The file "{0}" could not be loaded. @@ -46,31 +46,6 @@ org.apache.tools.ant.gui.command.SaveCmd.noProject=No project to save. org.apache.tools.ant.gui.command.SaveCmd.title=Overwrite? org.apache.tools.ant.gui.command.SaveCmd.overwrite=Overwrite file "{0}"? -org.apache.tools.ant.gui.About.title=About -org.apache.tools.ant.gui.About.ok=OK -org.apache.tools.ant.gui.About.message=\ -

Antidote

\ -

Copyright © 2000 The Apache Software Foundation.
\ - All rights reserved.


\ -

Visit http://jakarta.apache.org/ant for more information.


\ - \ - \ - \ - \ - \ -
Version:{0}
Date:{1}
Contributors:{2}
\ -
\ -

Icons Copyright © 1998 Dean S. Jones (deansjones@hotmail.com)
\ - http://jfa.javalobby.org/projects/icons

\ - - - -org.apache.tools.ant.gui.ChangeLookAndFeel.title=Change Look and Feel -org.apache.tools.ant.gui.ChangeLookAndFeel.border=Available L&F -org.apache.tools.ant.gui.ChangeLookAndFeel.ok=OK -org.apache.tools.ant.gui.ChangeLookAndFeel.error=Error setting look and feel: - - # Properties file for BeanInfo strings org.apache.tools.ant.gui.acs.ACSTargetElementBeanInfo.beanName=Target @@ -111,3 +86,27 @@ org.apache.tools.ant.gui.acs.ACSTaskElementBeanInfo.icon=task.gif +#---------------------------------------------------------------------------- +# About Description (NB: this is only a temporary approach). +#---------------------------------------------------------------------------- + +org.apache.tools.ant.gui.About.title=About +org.apache.tools.ant.gui.About.ok=OK +org.apache.tools.ant.gui.About.message=\ +

Antidote

\ +

Copyright © 2000 The Apache Software Foundation.
\ + All rights reserved.


\ +

Visit http://jakarta.apache.org/ant for more information.


\ + \ + \ + \ + \ + \ +
Version:{0}
Date:{1}
Contributors:{2}
\ +
\ +

Icons Copyright © 1998 Dean S. Jones (deansjones@hotmail.com)
\ + http://jfa.javalobby.org/projects/icons

\ + + + + diff --git a/src/antidote/org/apache/tools/ant/gui/ChangeLookAndFeel.java b/src/antidote/org/apache/tools/ant/gui/util/ChangeLookAndFeel.java similarity index 98% rename from src/antidote/org/apache/tools/ant/gui/ChangeLookAndFeel.java rename to src/antidote/org/apache/tools/ant/gui/util/ChangeLookAndFeel.java index 72030ac3c..3ea077fd5 100644 --- a/src/antidote/org/apache/tools/ant/gui/ChangeLookAndFeel.java +++ b/src/antidote/org/apache/tools/ant/gui/util/ChangeLookAndFeel.java @@ -51,8 +51,10 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.util; + +import org.apache.tools.ant.gui.core.AppContext; import org.apache.tools.ant.gui.event.ErrorEvent; import org.apache.tools.ant.gui.util.WindowUtils; diff --git a/src/antidote/org/apache/tools/ant/gui/LabelFieldGBC.java b/src/antidote/org/apache/tools/ant/gui/util/LabelFieldGBC.java similarity index 99% rename from src/antidote/org/apache/tools/ant/gui/LabelFieldGBC.java rename to src/antidote/org/apache/tools/ant/gui/util/LabelFieldGBC.java index 57649922c..afd122554 100644 --- a/src/antidote/org/apache/tools/ant/gui/LabelFieldGBC.java +++ b/src/antidote/org/apache/tools/ant/gui/util/LabelFieldGBC.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.util; import java.awt.GridBagConstraints; import java.awt.Insets; diff --git a/src/antidote/org/apache/tools/ant/gui/XMLHelper.java b/src/antidote/org/apache/tools/ant/gui/util/XMLHelper.java similarity index 98% rename from src/antidote/org/apache/tools/ant/gui/XMLHelper.java rename to src/antidote/org/apache/tools/ant/gui/util/XMLHelper.java index 00a03deb2..aef5f2836 100644 --- a/src/antidote/org/apache/tools/ant/gui/XMLHelper.java +++ b/src/antidote/org/apache/tools/ant/gui/util/XMLHelper.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.gui; +package org.apache.tools.ant.gui.util; /** * Placeholder for XML related duties.