Login | Register
My pages Projects Community openCollabNet

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

antelope
Discussion topic

Back to topic list

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

Author danson
Full name Dale Anson
Date 2004-03-07 17:52:48 PST
Message User: danson
Date: 04/03/07 17:52:48

Modified:
 /antelope/
  build-app.xml
 /antelope/src/
  ant.dtd
 /antelope/src/ise/an​telope/common/builde​r/
  ElementPanel.java, ProjectBuilder.java
 /antelope/src/ise/library/
  GUIUtils.java

Log:
 who knows???
 

File Changes:

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

File [changed]: build-app.xml
Url: http://antelope.tigr​is.org/source/browse​/antelope/build-app.​xml?r1=1.8&r2=1.​9
Delta lines: +1 -4
-------------------
--- build-app.xml 2 Mar 2004 06:44:19 -0000 1.8
+++ build-app.xml 8 Mar 2004 01:52:43 -0000 1.9
@@ -52,7 +52,7 @@
    ====================​====================​====================​============= -->
     <target name="clean" description="Delete all files from the classes directory.">
         <delete>
- <fileset dir="${classes.dir}" includes="**" />
+ <fileset dir="${classes.dir}" includes="**/*" />
             <fileset dir="${prep.dir}">
                <include name="**/*"/>
                <exclude name="docs/**/*"/>
@@ -198,9 +198,6 @@
     <target name="copy_resources">
         <copy todir="${classes.di​r}/images">
             <fileset dir="${src.dir}/images" includes="**/*" />
- </copy>
- <copy todir="${classes.di​r}/ise/antelope/comm​on/gui">
- <fileset dir="${src.dir}" includes="ant.dtd"/>
         </copy>
         
         <copy todir="${classes.di​r}/ise/antelope/task​s">

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

File [changed]: ant.dtd
Url: http://antelope.tigr​is.org/source/browse​/antelope/src/ant.dt​d?r1=1.2&r2=1.3
Delta lines: +29 -29
---------------------
--- ant.dtd 4 Mar 2004 14:15:54 -0000 1.2
+++ ant.dtd 8 Mar 2004 01:52:43 -0000 1.3
@@ -32,28 +32,28 @@
 <!ELEMENT include EMPTY>
 <!ATTLIST include
           id ID #IMPLIED
- name CDATA #IMPLIED
+ name CDATA #REQUIRED
           unless CDATA #IMPLIED
           if CDATA #IMPLIED>
 
 <!ELEMENT exclude EMPTY>
 <!ATTLIST exclude
           id ID #IMPLIED
- name CDATA #IMPLIED
+ name CDATA #REQUIRED
           unless CDATA #IMPLIED
           if CDATA #IMPLIED>
 
 <!ELEMENT excludesfile EMPTY>
 <!ATTLIST excludesfile
           id ID #IMPLIED
- name CDATA #IMPLIED
+ name CDATA #REQUIRED
           unless CDATA #IMPLIED
           if CDATA #IMPLIED>
 
 <!ELEMENT includesfile EMPTY>
 <!ATTLIST includesfile
           id ID #IMPLIED
- name CDATA #IMPLIED
+ name CDATA #REQUIRED
           unless CDATA #IMPLIED
           if CDATA #IMPLIED>
 
@@ -81,7 +81,7 @@
           id ID #IMPLIED
           refid IDREF #IMPLIED
           description CDATA #IMPLIED
- dynamic %boolean; #IMPLIED>
+ dynamic %boolean; "true">
 
 <!ELEMENT propertyref EMPTY>
 <!ATTLIST propertyref
@@ -117,9 +117,9 @@
           refid IDREF #IMPLIED
           file CDATA #IMPLIED
           dir CDATA #IMPLIED
- defaultexcludes %boolean; #IMPLIED
- followsymlinks %boolean; #IMPLIED
- casesensitive %boolean; #IMPLIED
+ defaultexcludes %boolean; "true"
+ followsymlinks %boolean; "true"
+ casesensitive %boolean; "true"
           description CDATA #IMPLIED
           excludes CDATA #IMPLIED
           includesfile CDATA #IMPLIED
@@ -321,7 +321,7 @@
 <!ELEMENT filelist EMPTY>
 <!ATTLIST filelist
           id ID #IMPLIED
- dir CDATA #IMPLIED
+ dir CDATA #REQUIRED
           refid IDREF #IMPLIED
           description CDATA #IMPLIED
           files CDATA #IMPLIED>
@@ -351,8 +351,8 @@
 <!ELEMENT filterset (filterset | filter | filtersfile)*>
 <!ATTLIST filterset
           id ID #IMPLIED
- begintoken CDATA #IMPLIED
- endtoken CDATA #IMPLIED
+ begintoken CDATA "@"
+ endtoken CDATA "@"
           refid IDREF #IMPLIED
           description CDATA #IMPLIED
           filtersfile CDATA #IMPLIED>
@@ -360,13 +360,13 @@
 <!ELEMENT filter EMPTY>
 <!ATTLIST filter
           id ID #IMPLIED
- token CDATA #IMPLIED
- value CDATA #IMPLIED>
+ token CDATA #REQUIRED
+ value CDATA #REQUIRED>
 
 <!ELEMENT filtersfile EMPTY>
 <!ATTLIST filtersfile
           id ID #IMPLIED
- file CDATA #IMPLIED>
+ file CDATA #REQUIRED>
 
 <!ELEMENT libfileset (patternset | exclude | include | custom | present | none | not | type | modified | or | contains | depend | different | size | majority | containsregexp | filename | selector | includesfile | date | excludesfile | depth | and)*>
 <!ATTLIST libfileset
@@ -393,7 +393,7 @@
           classpathref IDREF #IMPLIED
           refid IDREF #IMPLIED
           description CDATA #IMPLIED
- classname CDATA #IMPLIED>
+ classname CDATA #REQUIRED>
 
 <!ELEMENT scriptfilter (#PCDATA)>
 <!ATTLIST scriptfilter
@@ -519,7 +519,7 @@
 <!ELEMENT containsstring EMPTY>
 <!ATTLIST containsstring
           id ID #IMPLIED
- contains CDATA #IMPLIED>
+ contains CDATA #REQUIRED>
 
 <!ELEMENT linetokenizer EMPTY>
 <!ATTLIST linetokenizer
@@ -572,10 +572,10 @@
           refid IDREF #IMPLIED
           file CDATA #IMPLIED
           dir CDATA #IMPLIED
- defaultexcludes %boolean; #IMPLIED
- followsymlinks %boolean; #IMPLIED
+ defaultexcludes %boolean; "true"
+ followsymlinks %boolean; "true"
           rootclass CDATA #IMPLIED
- casesensitive %boolean; #IMPLIED
+ casesensitive %boolean; "true"
           description CDATA #IMPLIED
           excludes CDATA #IMPLIED
           includesfile CDATA #IMPLIED
@@ -588,9 +588,9 @@
           refid IDREF #IMPLIED
           file CDATA #IMPLIED
           dir CDATA #IMPLIED
- defaultexcludes %boolean; #IMPLIED
- followsymlinks %boolean; #IMPLIED
- casesensitive %boolean; #IMPLIED
+ defaultexcludes %boolean; "true"
+ followsymlinks %boolean; "true"
+ casesensitive %boolean; "true"
           description CDATA #IMPLIED
           excludes CDATA #IMPLIED
           includesfile CDATA #IMPLIED
@@ -614,9 +614,9 @@
 <!ELEMENT entity EMPTY>
 <!ATTLIST entity
           id ID #IMPLIED
- location CDATA #IMPLIED
+ location CDATA #REQUIRED
           base CDATA #IMPLIED
- publicid CDATA #IMPLIED>
+ publicid CDATA #REQUIRED>
 
 <!ELEMENT catalogpath (fileset | dirset | extdirs | filelist | existing | pathelement | path)*>
 <!ATTLIST catalogpath
@@ -648,7 +648,7 @@
           dir CDATA #IMPLIED
           defaultexcludes %boolean; #IMPLIED
           followsymlinks %boolean; #IMPLIED
- filemode CDATA #IMPLIED
+ filemode CDATA "644"
           prefix CDATA #IMPLIED
           casesensitive %boolean; #IMPLIED
           description CDATA #IMPLIED
@@ -657,7 +657,7 @@
           includesfile CDATA #IMPLIED
           excludes CDATA #IMPLIED
           includes CDATA #IMPLIED
- dirmode CDATA #IMPLIED>
+ dirmode CDATA "755">
 
 <!ELEMENT substitution EMPTY>
 <!ATTLIST substitution
@@ -755,10 +755,10 @@
 <!ATTLIST cvspass
           id ID #IMPLIED
           taskname CDATA #IMPLIED
- password CDATA #IMPLIED
+ password CDATA #REQUIRED
           description CDATA #IMPLIED
- cvsroot CDATA #IMPLIED
- passfile CDATA #IMPLIED>
+ cvsroot CDATA #REQUIRED
+ passfile CDATA "~/.cvspass">
 
 <!ELEMENT p4reopen EMPTY>
 <!ATTLIST p4reopen

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

File [changed]: ElementPanel.java
Url: http://antelope.tigr​is.org/source/browse​/antelope/src/ise/an​telope/common/builde​r/ElementPanel.java?​r1=1.3&r2=1.4
Delta lines: +16 -18
---------------------
--- ElementPanel.java 4 Mar 2004 14:15:55 -0000 1.3
+++ ElementPanel.java 8 Mar 2004 01:52:44 -0000 1.4
@@ -40,13 +40,12 @@
       list.setTransferHandler( new ElementTransferHandler() );
       list.setDragEnabled( true );
       //list.addMouseListener( new AttributeViewer( list ) );
- list.addMouseListener( new MenuPopup() );
+ addMouseListener( new MenuPopup() );
 
    }
 
    class MenuPopup extends MouseAdapter {
       private JPopupMenu pm = new JPopupMenu();
- private ElementPanel child = null;
 
       public MenuPopup() {
          JMenuItem props_mi = new JMenuItem( "Properties" );
@@ -56,9 +55,7 @@
 
          props_mi.addActionListener( new ActionListener() {
                   public void actionPerformed( ActionEvent ae ) {
- if ( child == null )
- return ;
- new AttributeViewer( child );
+ new AttributeViewer( ElementPanel.this );
                   }
                }
                                    );
@@ -70,20 +67,16 @@
          doPopup( me );
       }
       private void doPopup( MouseEvent me ) {
- if ( me.isPopupTrigger() ) {
- JList list = getList();
- int index = list.locationToIndex( me.getPoint() );
- if ( index > -1 ) {
- list.setSelectedIndex( index );
- child = (ElementPanel)list.g​etSelectedValue();
- GUIUtils.showPopupMenu( pm, ElementPanel.this, me.getX(), me.getY() );
- }
-
+ if ( me.isPopupTrigger()) {
+ GUIUtils.showPopupMenu( pm, me.getComponent(), me.getX(), me.getY() );
          }
       }
 
    }
 
+ /**
+ * @return the dtd element name, e.g. target, description, javac, etc.
+ */
    public String getName() {
       return element_name;
    }
@@ -96,6 +89,10 @@
       return tree_path;
    }
 
+ public boolean canAccept( TreePath tp ) {
+ return true;
+ }
+
    /**
     * @return a Map containing the DTD attributes for this element. The map keys
     * are the names of the attributes, the values are DTDAttributes.
@@ -125,10 +122,11 @@
          DTDDecl decl = attribute.getDecl();
          boolean required = decl.equals( DTDDecl.REQUIRED );
          sb.append( "<span>&nb​sp;&nbsp;" );
- if ( required )
- sb.append( "<font color=red>*</font>" );
+ if ( required ) {
+ //sb.append( "<font color=red>*</font>" );
          String value = attribute.getDefaultValue();
          sb.append( name ).append( ":&nbsp&nbsp​;</span><sp​an>" ).append( value == null ? "" : value ).append( "</span><br>" );
+ }
       }
       sb.append( "</html>" );
       return sb.toString();

File [changed]: ProjectBuilder.java
Url: http://antelope.tigr​is.org/source/browse​/antelope/src/ise/an​telope/common/builde​r/ProjectBuilder.jav​a?r1=1.2&r2=1.3
Delta lines: +6 -5
-------------------
--- ProjectBuilder.java 3 Mar 2004 04:45:27 -0000 1.2
+++ ProjectBuilder.java 8 Mar 2004 01:52:45 -0000 1.3
@@ -53,7 +53,7 @@
          // with a subnode for each child
 
          DefaultMutableTreeNode root_node = new DefaultMutableTreeNode( DNDConstants.PROJECT );
- DefaultMutableTreeNode target_node = new DefaultMutableTreeNode( DNDConstants.TARGET );
+ DroppableTreeNode target_node = new DroppableTreeNode( DNDConstants.TARGET, true );
          DefaultMutableTreeNode task_node = new DefaultMutableTreeNode( DNDConstants.TASK );
          DefaultMutableTreeNode type_node = new DefaultMutableTreeNode( DNDConstants.TYPE );
          root_node.add( target_node );
@@ -78,7 +78,7 @@
          // add the tasks to the task node
          Iterator it = task_list.iterator();
          while ( it.hasNext() ) {
- DefaultMutableTreeNode node = new DefaultMutableTreeNode( it.next() );
+ DroppableTreeNode node = new DroppableTreeNode( it.next(), true );
             task_node.add( node );
             addChildren( node );
          }
@@ -94,7 +94,7 @@
          // add the types to the types node
          it = type_list.iterator();
          while ( it.hasNext() ) {
- DefaultMutableTreeNode node = new DefaultMutableTreeNode( it.next() );
+ DroppableTreeNode node = new DroppableTreeNode( it.next(), true );
             type_node.add( node );
             addChildren( node );
          }
@@ -105,10 +105,11 @@
          project_tree.setDragEnabled( true );
 
          ElementPanel project_panel = new ElementPanel(project​_tree.getPathForRow(​0));
+ ProjectTreePanel project_tree_panel = new ProjectTreePanel();
          JSplitPane splitpane = new JSplitPane( JSplitPane.HORIZONTAL_SPLIT,
                true,
                new JScrollPane( project_tree ),
- new JScrollPane( project_panel ) );
+ new JSplitPane(JSplitPan​e.HORIZONTAL_SPLIT, true, new JScrollPane(project_​tree_panel), new JScrollPane( project_panel )) );
          setLayout( new LambdaLayout() );
          add( splitpane, "0, 0, 1, 1, 0, wh, 3" );
          project_tree.setDrag​Enabled(true);
@@ -129,7 +130,7 @@
          for ( int i = 0; i < contents.length; i++ ) {
             if ( contents[ i ] instanceof DTDName ) {
                String child_name = ( ( DTDName ) contents[ i ] ).getValue();
- DefaultMutableTreeNode child = new DefaultMutableTreeNode( child_name );
+ DroppableTreeNode child = new DroppableTreeNode( child_name, true );
                node.add( child );
             }
          }

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

File [changed]: GUIUtils.java
Url: http://antelope.tigr​is.org/source/browse​/antelope/src/ise/li​brary/GUIUtils.java?​r1=1.1&r2=1.2
Delta lines: +4 -2
-------------------
--- GUIUtils.java 15 Feb 2004 22:15:19 -0000 1.1
+++ GUIUtils.java 8 Mar 2004 01:52:45 -0000 1.2
@@ -1,4 +1,4 @@
-// $Id: GUIUtils.java,v 1.1 2004/02/15 22:15:19 danson Exp $
+// $Id: GUIUtils.java,v 1.2 2004/03/08 01:52:45 danson Exp $
 /*
 * Based on the Apache Software License, Version 1.1
 *
@@ -56,7 +56,7 @@
  * here in one place. Could be easily modified to be AWT-only utilities.
  *
  * @author Dale Anson
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public class GUIUtils {
 
@@ -207,6 +207,8 @@
 
       popup.show( comp, x, y );
    }
+
+
 
 }
 




--------------------​--------------------​--------------------​---------
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/, /antelope/src/ise/antelope/common/builder/, /antelope/src/ise/library/ danson Dale Anson 2004-03-07 17:52:48 PST
Messages per page: