diff --git a/src/antidote/org/apache/tools/ant/gui/About.java b/src/antidote/org/apache/tools/ant/gui/About.java index eebf51a58..aa07f16b6 100644 --- a/src/antidote/org/apache/tools/ant/gui/About.java +++ b/src/antidote/org/apache/tools/ant/gui/About.java @@ -82,7 +82,6 @@ public class About extends JDialog { String version = null; String date = null; - String contributors = null; Properties props = new Properties(); @@ -97,21 +96,10 @@ public class About extends JDialog { version = props.getProperty("VERSION", "??"); date = props.getProperty("DATE", "??"); - // XXX eventually this should be tokenized on commas and - // presented nicely in box. - contributors = props.getProperty("CONTRIBUTORS", "??"); - - StringBuffer buf = new StringBuffer(); - StringTokenizer tok = new StringTokenizer(contributors, ","); - while(tok.hasMoreTokens()) { - String name = tok.nextToken(); - buf.append(name); - buf.append("
\n"); - } String message = context.getResources().getMessage( getClass(), "message", - new Object[] { version, date, buf.toString() }); + new Object[] { version, date }); String title = context.getResources().getString( getClass(), "title"); diff --git a/src/antidote/org/apache/tools/ant/gui/Main.java b/src/antidote/org/apache/tools/ant/gui/Main.java index a847dc887..64f1a4c8f 100644 --- a/src/antidote/org/apache/tools/ant/gui/Main.java +++ b/src/antidote/org/apache/tools/ant/gui/Main.java @@ -55,6 +55,7 @@ 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 org.apache.tools.ant.gui.event.EventBus; import javax.swing.*; import java.awt.BorderLayout; import java.io.File; @@ -91,6 +92,12 @@ public class Main { ProjectSelectionMenu ps = new ProjectSelectionMenu(context); ps.insertInto(menu); + // Add debugging items. + if(context.isDebugOn()) { + context.getEventBus().addMember( + EventBus.VETOING, new EventDebugMonitor()); + } + ImageIcon icon = context.getResources().loadImageIcon("icon-small.gif"); if(icon != null) { diff --git a/src/antidote/org/apache/tools/ant/gui/core/EventDebugMonitor.java b/src/antidote/org/apache/tools/ant/gui/core/EventDebugMonitor.java new file mode 100644 index 000000000..2bad9878f --- /dev/null +++ b/src/antidote/org/apache/tools/ant/gui/core/EventDebugMonitor.java @@ -0,0 +1,106 @@ +/* + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2001 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", "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 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.core; + +import org.apache.tools.ant.gui.event.BusMember; +import org.apache.tools.ant.gui.event.BusFilter; +import java.util.EventObject; + +/** + * Class that prints all events to stderr. + * + * @version $Revision$ + * @author Simeon Fitch + */ +public class EventDebugMonitor implements BusMember { + + /** Filter for all events. */ + private final Filter _filter = new Filter(); + + /** + * Defatult ctor. + * + */ + public EventDebugMonitor() { + } + + /** + * Get the filter to that is used to determine if an event should + * to to the member. + * + * @return Filter to use. + */ + public BusFilter getBusFilter() { + return _filter; + } + + /** + * Called when an event is to be posed to the member. + * + * @param event Event to post. + * @return true if event should be propogated, false if + * it should be cancelled. + */ + public boolean eventPosted(EventObject event) { + System.err.println(event); + return true; + } + + /** Filter for all events. */ + private static class Filter implements BusFilter { + public boolean accept(EventObject event) { + return true; + } + } +} diff --git a/src/antidote/org/apache/tools/ant/gui/version.txt b/src/antidote/org/apache/tools/ant/gui/version.txt index f50c246ad..b6b2f8db9 100644 --- a/src/antidote/org/apache/tools/ant/gui/version.txt +++ b/src/antidote/org/apache/tools/ant/gui/version.txt @@ -1,6 +1,2 @@ VERSION=@VERSION@ DATE=@DATE@ -CONTRIBUTORS=\ - Simeon H.K. Fitch (simeon@fitch.net), \ - Erik Meade (emeade@geekfarm.org), \ - Ant Development Team (ant-dev@jakarta.apache.org)