Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /antelope/, /antelope/src/ise/antelope/common/, /antelope/src/ise/antelope/plugin/, /antelope/src/ise/library/

antelope
Discussion topic

Back to topic list

CVS update: /antelope/, /antelope/src/ise/antelope/common/, /antelope/src/ise/antelope/plugin/, /antelope/src/ise/library/

Author danson
Full name Dale Anson
Date 2004-05-29 18:42:02 PDT
Message User: danson
Date: 04/05/29 18:42:02

Modified:
 /antelope/
  build-plugin.xml
 /antelope/src/ise/an​telope/common/
  AntelopePanel.java, SAXNodeHandler.java, SAXPanel.java
 /antelope/src/ise/an​telope/plugin/
  AntelopePlugin.java
 /antelope/src/ise/library/
  Finder.java, Nav.java, UserPreferences.java

Log:
 general commit
 
 Issue number:
 Obtained from:
 Submitted by:
 Reviewed by:

File Changes:

Directory: /antelope/
=====================

File [changed]: build-plugin.xml
Url: http://antelope.tigr​is.org/source/browse​/antelope/build-plug​in.xml?r1=1.8&r2​=1.9
Delta lines: +2 -3
-------------------
--- build-plugin.xml 8 May 2004 02:42:55 -0000 1.8
+++ build-plugin.xml 30 May 2004 01:42:02 -0000 1.9
@@ -1,5 +1,5 @@
 
-<project name="Antelope" default="dist" basedir=".">
+<project name="Antelope" default="dist" basedir="." xmlns:antelope="antl​ib:ise.antelope.task​s">
    <description>
        This build file creates Antelope as a jEdit plugin.
     </description>
@@ -43,7 +43,6 @@
     <!-- where to put the finished distribution file -->
    <property name="dist.dir" location="dist"/>
     
-
     
    <!-- ====================​====================​====================​============
       Target: set classpath

Directory: /antelope/src/ise/an​telope/common/
====================​====================​=====

File [changed]: AntelopePanel.java
Url: http://antelope.tigr​is.org/source/browse​/antelope/src/ise/an​telope/common/Antelo​pePanel.java?r1=1.15​&r2=1.16
Delta lines: +16 -12
---------------------
--- AntelopePanel.java 19 May 2004 19:13:02 -0000 1.15
+++ AntelopePanel.java 30 May 2004 01:42:02 -0000 1.16
@@ -1,10 +1,10 @@
-// $Id: AntelopePanel.java,v 1.15 2004/05/19 19:13:02 danson Exp $
+// $Id: AntelopePanel.java,v 1.16 2004/05/30 01:42:02 danson Exp $
 /*
-* Based on the Apache Software License, Version 1.1
-*
-* Copyright (c) 2002 Dale Anson. All rights reserved.
+ * Based on the Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 Dale Anson. All rights reserved.
  *
-* Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
@@ -59,6 +59,7 @@
 import javax.swing.event.*;
 
 import ise.library.*;
+import ise.antelope.tasks.*;
 
 import org.apache.tools.ant.*;
 
@@ -67,7 +68,7 @@
  * progress.
  *
  * @author Dale Anson, danson at germane-software dot com
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
  * @created July 23, 2002
  */
 public class AntelopePanel extends JPanel implements Constants {
@@ -1072,6 +1073,8 @@
 
 
                   Target target = ( Target ) targets.get( target_name );
+ if (target == null)
+ continue;
                   String description = target.getDescription();
                   if ( _settings.getShowAllTargets() ) {
                      _targets.put( target_name, target );
@@ -1229,18 +1232,19 @@
       AntProject p = new AntProject();
       try {
          ClassLoader cl = _helper.getAntClassLoader();
+ p.setCoreLoader(cl);
          p.init( cl ); // this takes as much as 9 seconds the first time, less than 1/2 second later
 
          // add the antelope build logger now so that any output produced by the
          // ProjectHelper is captured
          p.addBuildListener( _build_logger );
 
- /// this is the "recommended" way, but throws an NPE
- //ProjectHelper ph = ProjectHelper.getPro​jectHelper();
- //ph.parse(p, build_file);
- ProjectHelper.configureProject( p, build_file );
- p.setProperty( "ant.file", build_file.getAbsolutePath() );
+ p.setUserProperty( "ant.file", build_file.getAbsolutePath() );
          p.setProperty( "ant.version", Main.getAntVersion() );
+ String ant_home = System.getProperty("ant.home");
+ if (ant_home != null)
+ p.setProperty("ant.home", ant_home);
+ ProjectHelper.configureProject( p, build_file );
 
          // add ant.jar to the classpath
          // for Ant 1.6, does ant-launcher.jar need to be added also? --

File [changed]: SAXNodeHandler.java
Url: http://antelope.tigr​is.org/source/browse​/antelope/src/ise/an​telope/common/SAXNod​eHandler.java?r1=1.8​&r2=1.9
Delta lines: +349 -331
-----------------------
--- SAXNodeHandler.java 14 Apr 2004 13:10:22 -0000 1.8
+++ SAXNodeHandler.java 30 May 2004 01:42:02 -0000 1.9
@@ -28,7 +28,7 @@
  * &lt;import&gt; task introduced in Ant 1.6.
  *
  * @author Dale Anson, danson at germane-software dot com
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  */
 public class SAXNodeHandler extends DefaultHandler {
 
@@ -230,7 +230,7 @@
 
 
    /**
- * Description of the Method
+ * Handles the end of an element.
     *
     * @param uri Description of the Parameter
     * @param localName Description of the Parameter
@@ -274,12 +274,29 @@
             String sid = new String( systemId );
             if ( sid.startsWith( "file:" ) )
                sid = sid.substring( "file:".length() );
- File f = new File( sid );
- if ( !f.exists() && infile != null ) {
- File dir = infile;
- if ( !dir.isDirectory() )
- dir = dir.getParentFile();
- f = new File( dir, f.getName() );
+ File f;
+ if (sid.startsWith("..")) {
+ // handle relative paths
+ if (infile == null)
+ return null;
+ if (!infile.isDirectory())
+ f = new File(infile.getParen​tFile().getParentFil​e(), sid.substring(2));
+ else
+ f = new File(infile.getParentFile(), sid.substring(2));
+ }
+ else {
+ // handle fully qualified name or in same directory
+ f = new File( sid );
+ if (!f.exists()) {
+ if (infile == null)
+ return null;
+ if (!infile.isDirectory())
+ f = new File(infile.getParentFile(), sid);
+ else
+ f = new File(infile, sid);
+ }
+ }
+ if ( f.exists() ) {
                try {
                   InputSource is = new InputSource( new FileReader( f ) );
                   is.setPublicId( publicId );
@@ -303,6 +320,7 @@
                   InputSource is = new InputSource( new java.net.URL( systemId ).openStream() );
                   is.setPublicId( publicId );
                   is.setSystemId( systemId );
+ System.out.println("is is " + is.toString());
                   return is;
                }
                catch ( Exception e ) {

File [changed]: SAXPanel.java
Url: http://antelope.tigr​is.org/source/browse​/antelope/src/ise/an​telope/common/SAXPan​el.java?r1=1.11&​r2=1.12
Delta lines: +7 -2
-------------------
--- SAXPanel.java 19 May 2004 14:03:57 -0000 1.11
+++ SAXPanel.java 30 May 2004 01:42:02 -0000 1.12
@@ -57,7 +57,6 @@
          bottom_panel.add( show_attr_mi, "0,0" );
          bottom_panel.add( _nav, "1, 0" );
 
-
          MouseAdapter ma = new MouseAdapter() {
                   public void mouseClicked( MouseEvent evt ) {
                      int clicks = evt.getClickCount();
@@ -80,11 +79,15 @@
                      }
                   }
                   public void mousePressed( MouseEvent me ) {
+ System.out.println("​mousePressed");
+ System.out.println("​me.isPopupTrigger = " + me.isPopupTrigger());
                      if ( me.isPopupTrigger() ) {
                         showPopup( me );
                      }
                   }
                   public void mouseReleased( MouseEvent me ) {
+ System.out.println("​mouseReleased");
+ System.out.println("​me.isPopupTrigger = " + me.isPopupTrigger());
                      if ( me.isPopupTrigger() ) {
                         showPopup( me );
                      }
@@ -174,7 +177,9 @@
                   }
                }
                ;
+
          tree.addMouseListener( ma );
+ System.out.println("added mouse listener");
       }
       catch ( Exception e ) {
          e.printStackTrace();

Directory: /antelope/src/ise/an​telope/plugin/
====================​====================​=====

File [changed]: AntelopePlugin.java
Url: http://antelope.tigr​is.org/source/browse​/antelope/src/ise/an​telope/plugin/Antelo​pePlugin.java?r1=1.9​&r2=1.10
Delta lines: +4 -3
-------------------
--- AntelopePlugin.java 8 May 2004 02:42:56 -0000 1.9
+++ AntelopePlugin.java 30 May 2004 01:42:02 -0000 1.10
@@ -1,4 +1,4 @@
-// $Id: AntelopePlugin.java,v 1.9 2004/05/08 02:42:56 danson Exp $
+// $Id: AntelopePlugin.java,v 1.10 2004/05/30 01:42:02 danson Exp $
 /*
 * Based on the Apache Software License, Version 1.1
 *
@@ -72,7 +72,7 @@
 /**
  * This is the AntelopePlugin.
  *
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
  */
 public class AntelopePlugin extends EBPlugin implements Constants {
    /**
@@ -484,7 +484,8 @@
             return null;
          }
       }
- // got Ant home
+ // got Ant home, store it in a system property
+ System.setProperty("ant.home", ant_home);
 
       // put all jars from ANT_HOME into line-separated string
       File lib_dir = new File( ant_home, "lib" );

Directory: /antelope/src/ise/library/
====================​=================

File [changed]: Finder.java
Url: http://antelope.tigr​is.org/source/browse​/antelope/src/ise/li​brary/Finder.java?r1​=1.1&r2=1.2
Delta lines: +3 -2
-------------------
--- Finder.java 24 May 2004 04:11:27 -0000 1.1
+++ Finder.java 30 May 2004 01:42:02 -0000 1.2
@@ -6,7 +6,8 @@
 import java.util.regex.*;
 
 /**
- * Action to do a find in a text component.
Does regular expression searching.
+ * Action to do a find in a text component.
+Does regular expression searching.
  * @author Dale Anson
  */
 public class Finder implements ActionListener {

File [changed]: Nav.java
Url: http://antelope.tigr​is.org/source/browse​/antelope/src/ise/li​brary/Nav.java?r1=1.​1&r2=1.2
Delta lines: +175 -154
-----------------------
--- Nav.java 15 Feb 2004 22:15:19 -0000 1.1
+++ Nav.java 30 May 2004 01:42:02 -0000 1.2
@@ -49,6 +49,9 @@
     * @param client the client object to provide navigation for
     */
    public Nav( Navable client ) {
+ if(true)
+ throw new RuntimeException("got a new nav");
+ System.out.println("new changes");
       if ( client == null )
          throw new IllegalArgumentException( "client cannot be null" );
       this.client = client;
@@ -56,8 +59,26 @@
       putClientProperty( "JToolBar.isRollover", Boolean.TRUE );
 
       // set up the buttons
- back = new JButton( new ImageIcon(getClass()​.getClassLoader().ge​tResource("images/Ba​ck16.gif")) );
- forward = new JButton( new ImageIcon(getClass()​.getClassLoader().ge​tResource("images/Fo​rward16.gif")) );
+ back = new JButton();
+ java.net.URL url = getClass().getClassL​oader().getResource(​ "images/Back16.gif" );
+ Icon icon = null;
+ if ( url != null )
+ icon = new ImageIcon( url );
+ if (icon == null)
+ back.setIcon( icon );
+ else
+ back.setText("<");
+
+ forward = new JButton();
+ url = getClass().getClassL​oader().getResource(​ "images/Forward16.gif" );
+ icon = null;
+ if ( url != null )
+ icon = new ImageIcon( url );
+ if (icon == null)
+ forward.setIcon( icon );
+ else
+ forward.setText("<");
+
       back.setMargin( new Insets( 0, 0, 0, 0 ) );
       forward.setMargin( new Insets( 0, 0, 0, 0 ) );
       back.setActionCommand( BACK );

File [changed]: UserPreferences.java
Url: http://antelope.tigr​is.org/source/browse​/antelope/src/ise/li​brary/UserPreference​s.java?r1=1.2&r2​=1.3
Delta lines: +1 -1
-------------------
--- UserPreferences.java 24 Feb 2004 05:47:12 -0000 1.2
+++ UserPreferences.java 30 May 2004 01:42:02 -0000 1.3
@@ -10,7 +10,7 @@
  * about file permissions, this implementation does not have those problems.
  * <p>
  * Nodes are named using a / separated naming convention. The preferences are
- * stored in a tree-like structure, with the root node names "" per the
+ * stored in a tree-like structure, with the root node named "" per the
  * preferences specification. A node directly below the root node would be
  * referenced by a / followed by the node name, for example "/node0". Node below
  * the initial child nodes follow the same convention, so "/node0/child0/kid2"




--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe@ante​lope.tigris.org
For additional commands, e-mail: cvs-help at antelope dot tigris dot org

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /antelope/, /antelope/src/ise/antelope/common/, /antelope/src/ise/antelope/plugin/, /antelope/src/ise/library/ danson Dale Anson 2004-05-29 18:42:02 PDT
Messages per page: