bodewig 01/07/26 00:07:41
Modified: src/java/org/apache/tools/ant/gui Antidote.java Main.java
src/java/org/apache/tools/ant/gui/acs ACSNamedElement.java
ACSPropertyElement.java ACSTargetElement.java
src/java/org/apache/tools/ant/gui/modules TargetMonitor.java
src/java/org/apache/tools/ant/gui/modules/edit
PropertyEditor.java
src/java/org/apache/tools/ant/gui/xml/dtd
ANTDocumentType.java
Log:
Make Antidote compile with jikes.
Committing it mayself by Christoph's request as he's sitting behind
the corporate firewall right now.
Submitted by: Stefan Bodewig <[EMAIL PROTECTED]>
Revision Changes Path
1.4 +6 -2
jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/Antidote.java
Index: Antidote.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/Antidote.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Antidote.java 2001/06/21 16:26:17 1.3
+++ Antidote.java 2001/07/26 07:07:40 1.4
@@ -66,7 +66,11 @@
import java.lang.reflect.Constructor;
-import javax.swing.*;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JMenuBar;
+import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
import java.util.EventObject;
import java.util.LinkedList;
@@ -76,7 +80,7 @@
* The root class for the Ant GUI. Assembles all the graphical components
* based on the configuration files.
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
* @author Simeon Fitch
*/
public class Antidote extends JComponent {
1.4 +5 -2
jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/Main.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Main.java 2001/06/21 16:29:55 1.3
+++ Main.java 2001/07/26 07:07:40 1.4
@@ -62,14 +62,17 @@
import org.apache.tools.ant.gui.event.AppStartupEvent;
import org.apache.tools.ant.gui.event.AppShutdownEvent;
import org.apache.tools.ant.gui.acs.ACSFactory;
-import javax.swing.*;
+
+import javax.swing.ImageIcon;
+import javax.swing.JMenuBar;
+
import java.awt.BorderLayout;
import java.io.File;
/**
* Launch point for the Antidote GUI. Configurs it as an application.
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
* @author Simeon Fitch
*/
public class Main {
1.2 +1 -2
jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSNamedElement.java
Index: ACSNamedElement.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSNamedElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACSNamedElement.java 2001/04/08 23:42:09 1.1
+++ ACSNamedElement.java 2001/07/26 07:07:40 1.2
@@ -53,13 +53,12 @@
*/
package org.apache.tools.ant.gui.acs;
-import com.sun.xml.tree.ElementNode;
import java.util.StringTokenizer;
/**
* Class representing an element with a name and description.
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Simeon Fitch
*/
public class ACSNamedElement extends ACSDtdDefinedElement {
1.2 +1 -3
jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSPropertyElement.java
Index: ACSPropertyElement.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSPropertyElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ACSPropertyElement.java 2001/04/08 23:42:09 1.1
+++ ACSPropertyElement.java 2001/07/26 07:07:40 1.2
@@ -53,12 +53,10 @@
*/
package org.apache.tools.ant.gui.acs;
-import com.sun.xml.tree.ElementNode;
-
/**
* Element containing a property definition.
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Simeon Fitch
*/
public class ACSPropertyElement extends ACSDtdDefinedElement {
1.3 +1 -2
jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSTargetElement.java
Index: ACSTargetElement.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/acs/ACSTargetElement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ACSTargetElement.java 2001/06/04 18:17:36 1.2
+++ ACSTargetElement.java 2001/07/26 07:07:40 1.3
@@ -53,13 +53,12 @@
*/
package org.apache.tools.ant.gui.acs;
-import com.sun.xml.tree.ElementNode;
import java.util.StringTokenizer;
/**
* Class representing a build target.
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
* @author Simeon Fitch
*/
public class ACSTargetElement extends ACSNamedElement implements Cloneable{
1.2 +5 -2
jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/modules/TargetMonitor.java
Index: TargetMonitor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/modules/TargetMonitor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TargetMonitor.java 2001/04/08 23:42:14 1.1
+++ TargetMonitor.java 2001/07/26 07:07:41 1.2
@@ -57,9 +57,12 @@
import org.apache.tools.ant.gui.acs.ACSElement;
import org.apache.tools.ant.gui.acs.ACSTargetElement;
import org.apache.tools.ant.gui.acs.ElementTreeSelectionModel;
-import javax.swing.*;
+
+import javax.swing.JLabel;
+import javax.swing.UIManager;
import javax.swing.plaf.ComponentUI;
import javax.swing.text.Document;
+
import java.awt.BorderLayout;
import java.awt.Insets;
import java.awt.Dimension;
@@ -68,7 +71,7 @@
/**
* A widget for displaying the currently selected targets.
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Simeon Fitch
*/
public class TargetMonitor extends AntModule {
1.2 +5 -2
jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/modules/edit/PropertyEditor.java
Index: PropertyEditor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/modules/edit/PropertyEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyEditor.java 2001/04/08 23:42:15 1.1
+++ PropertyEditor.java 2001/07/26 07:07:41 1.2
@@ -57,7 +57,10 @@
import org.apache.tools.ant.gui.core.*;
import org.apache.tools.ant.gui.acs.*;
import org.apache.tools.ant.gui.event.*;
-import javax.swing.*;
+
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
import java.util.*;
import java.beans.*;
import java.io.StringReader;
@@ -69,7 +72,7 @@
/**
* Stub for a property editor.
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @author Simeon H.K. Fitch
*/
public class PropertyEditor extends AntModule {
1.3 +4 -4
jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/xml/dtd/ANTDocumentType.java
Index: ANTDocumentType.java
===================================================================
RCS file:
/home/cvs/jakarta-ant-antidote/src/java/org/apache/tools/ant/gui/xml/dtd/ANTDocumentType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ANTDocumentType.java 2001/07/10 19:54:51 1.2
+++ ANTDocumentType.java 2001/07/26 07:07:41 1.3
@@ -88,7 +88,7 @@
/**
* Reads the ANT DTD and provides information about it.
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
* @author Nick Davis<a href="mailto:[EMAIL PROTECTED]">mailto</a>
*/
public class ANTDocumentType {
@@ -562,15 +562,15 @@
// Is it the project.dtd?
if (systemId.indexOf(DTD_1) != -1) {
- url = getClass().getResource(DTD_1);
+ url = this.getClass().getResource(DTD_1);
}
// Is it the project-ext.dtd?
if (systemId.indexOf(DTD_2) != -1) {
- url = getClass().getResource(DTD_2);
+ url = this.getClass().getResource(DTD_2);
}
// Is it the share.dtd?
if (systemId.indexOf(DTD_SHARE) != -1) {
- url = getClass().getResource(DTD_SHARE);
+ url = this.getClass().getResource(DTD_SHARE);
}
if (url != null) {
