Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /antelope/, /antelope/src/docs/, /antelope/src/ise/antelope/app/, /antelope/src/ise/antelope/common/, /antelope/src/ise/antelope/tasks/, /antelope/src/ise/library/

antelope
Discussion topic

Back to topic list

CVS update: /antelope/, /antelope/src/docs/, /antelope/src/ise/antelope/app/, /antelope/src/ise/antelope/common/, /antelope/src/ise/antelope/tasks/, /antelope/src/ise/library/

Author danson
Full name Dale Anson
Date 2004-07-29 20:21:42 PDT
Message User: danson Date: 04/07/29 20:21:42 Modified: /antelope/ build-plugin.xml, build.props /antelope/src/docs/ ChangeLog.txt /antelope/src/ise/antelope/app/ AboutDialog.java /antelope/src/ise/antelope/common/ AntelopePanel.java, SAXNodeHandler.java, SAXPanel.java, SAXTreeModel.java, version.txt /antelope/src/ise/antelope/tasks/ PostTask.java /antelope/src/ise/library/ Nav.java Log: fix for issue #20. Issue number: Obtained from: Submitted by: Reviewed by: File Changes: Directory: /antelope/ ===================== File [changed]: build-plugin.xml Url: http://antelope.tigris.org/source/browse/antelope/build-plugin.xml?r1=1.9&r2=1.10 Delta lines: +1 -1 ------------------- --- build-plugin.xml 30 May 2004 01:42:02 -0000 1.9 +++ build-plugin.xml 30 Jul 2004 03:21:38 -0000 1.10 @@ -73,7 +73,7 @@ ========================================================================= --> - + File [changed]: build.props Url: http://antelope.tigris.org/source/browse/antelope/build.props?r1=1.21&r2=1.22 Delta lines: +7 -7 ------------------- --- build.props 24 May 2004 13:03:07 -0000 1.21 +++ build.props 30 Jul 2004 03:21:39 -0000 1.22 @@ -1,16 +1,16 @@ # required settings # linux: -jedit.install.dir=${user.home}/apps/jedit/4.2pre8 -docbook.xsl=file:///usr/share/sgml/docbook/xsl-stylesheets-1.60.1 -docbookx.dtd=file:///usr/share/sgml/docbook/xml-dtd-4.1.2/docbookx.dtd +#jedit.install.dir=${user.home}/apps/jedit/4.2pre8 +#docbook.xsl=file:///usr/share/sgml/docbook/xsl-stylesheets-1.60.1 +#docbookx.dtd=file:///usr/share/sgml/docbook/xml-dtd-4.1.2/docbookx.dtd # windows: -#jedit.install.dir=c:/jEdit -#docbook.xsl=file:///C:/cygwin/usr/share/docbook-xsl -#docbookx.dtd=file:///C:/cygwin/usr/share/docbook-xml42/docbookx.dtd +jedit.install.dir=c:/jEdit +docbook.xsl=file:///C:/cygwin/usr/share/docbook-xsl +docbookx.dtd=file:///C:/cygwin/usr/share/docbook-xml42/docbookx.dtd install.dir=${user.home}/.jedit/jars -build.num=3.1.8 +build.num=3.1.9 # optional settings, remove if you don't use jikes build.compiler=jikes Directory: /antelope/src/docs/ ============================== File [changed]: ChangeLog.txt Url: http://antelope.tigris.org/source/browse/antelope/src/docs/ChangeLog.txt?r1=1.12&r2=1.13 Delta lines: +4 -0 ------------------- --- ChangeLog.txt 24 May 2004 13:03:07 -0000 1.12 +++ ChangeLog.txt 30 Jul 2004 03:21:39 -0000 1.13 @@ -1,6 +1,10 @@ Antelope Change Log Version: @@build.num@@ +3.1.9: +29 July 2004 +o fix for issue #20, imported targets now have buttons. + 3.1.8: 23 May 2004 o Completed issue #12, added 'tail' to output window in app. Directory: /antelope/src/ise/antelope/app/ ========================================== File [changed]: AboutDialog.java Url: http://antelope.tigris.org/source/browse/antelope/src/ise/antelope/app/AboutDialog.java?r1=1.2&r2=1.3 Delta lines: +4 -4 ------------------- --- AboutDialog.java 31 Mar 2004 14:47:18 -0000 1.2 +++ AboutDialog.java 30 Jul 2004 03:21:39 -0000 1.3 @@ -1,4 +1,4 @@ -// $Id: AboutDialog.java,v 1.2 2004/03/31 14:47:18 danson Exp $ +// $Id: AboutDialog.java,v 1.3 2004/07/30 03:21:39 danson Exp $ /* * Based on the Apache Software License, Version 1.1 @@ -68,7 +68,7 @@ * can render html and even make the links work, so this About dialog can * actually connect the user to my home page. * - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * @author Dale Anson */ public class AboutDialog @@ -82,7 +82,7 @@ private JScrollPane scrollpane; /** Description of the Field */ - private Nav nav; + private Nav2 nav; private URL initialURL = null; /** @@ -155,7 +155,7 @@ JPanel btn_panel = new JPanel(); if ( use_nav ) { btn_panel.setLayout( new LambdaLayout() ); - nav = new Nav( this ); + nav = new Nav2( this ); btn_panel.add( nav, "0, 0, 1, 1, W, , 5" ); btn_panel.add( ok_btn, "1, 0, 1, 1, E, , 5" ); Directory: /antelope/src/ise/antelope/common/ ============================================= File [changed]: AntelopePanel.java Url: http://antelope.tigris.org/source/browse/antelope/src/ise/antelope/common/AntelopePanel.java?r1=1.17&r2=1.18 Delta lines: +1715 -1707 ------------------------- --- AntelopePanel.java 6 Jun 2004 11:09:56 -0000 1.17 +++ AntelopePanel.java 30 Jul 2004 03:21:40 -0000 1.18 @@ -1,4 +1,4 @@ -// $Id: AntelopePanel.java,v 1.17 2004/06/06 11:09:56 danson Exp $ +// $Id: AntelopePanel.java,v 1.18 2004/07/30 03:21:40 danson Exp $ /* * Based on the Apache Software License, Version 1.1 * @@ -68,7 +68,7 @@ * progress. * * @author Dale Anson, danson@germane-software.com - * @version $Revision: 1.17 $ + * @version $Revision: 1.18 $ * @created July 23, 2002 */ public class AntelopePanel extends JPanel implements Constants { @@ -1042,6 +1042,7 @@ // Ant 1.6 has an un-named target to hold project-level tasks, so // find it and save it for later. + _unnamed_target = null; if ( getAntVersion() == 16 ) { Iterator iter = targets.keySet().iterator(); @@ -1073,8 +1074,15 @@ Target target = ( Target ) targets.get( target_name ); + if (target == null) { + SAXTreeNode node = (SAXTreeNode)sax_targets.get(target_name); + if (node.isImported()) { + target_name = node.getAttributeValue("name"); + target = (Target)targets.get(target_name); + } if (target == null) continue; + } String description = target.getDescription(); if ( _settings.getShowAllTargets() ) { _targets.put( target_name, target ); @@ -1243,7 +1251,7 @@ p.setProperty( "ant.version", Main.getAntVersion() ); //String ant_home = System.getProperty("ant.home"); String ant_home = AntUtils.getAntHome(); - if (ant_home != null){ + if (ant_home != null) { p.setProperty("ant.home", ant_home); } String ant_lib_dirs = AntUtils.getAntLibDirs(); File [changed]: SAXNodeHandler.java Url: http://antelope.tigris.org/source/browse/antelope/src/ise/antelope/common/SAXNodeHandler.java?r1=1.9&r2=1.10 Delta lines: +1 -2 ------------------- --- SAXNodeHandler.java 30 May 2004 01:42:02 -0000 1.9 +++ SAXNodeHandler.java 30 Jul 2004 03:21:40 -0000 1.10 @@ -28,7 +28,7 @@ * <import> task introduced in Ant 1.6. * * @author Dale Anson, danson@germane-software.com - * @version $Revision: 1.9 $ + * @version $Revision: 1.10 $ */ public class SAXNodeHandler extends DefaultHandler { @@ -320,7 +320,6 @@ 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.tigris.org/source/browse/antelope/src/ise/antelope/common/SAXPanel.java?r1=1.13&r2=1.14 Delta lines: +3 -3 ------------------- --- SAXPanel.java 30 May 2004 14:20:51 -0000 1.13 +++ SAXPanel.java 30 Jul 2004 03:21:40 -0000 1.14 @@ -1,6 +1,6 @@ package ise.antelope.common; -import ise.library.Nav; +import ise.library.Nav2; import ise.library.Navable; import ise.library.LambdaLayout; import ise.library.GUIUtils; @@ -26,7 +26,7 @@ private JTree tree = null; private CommonHelper _helper; - private Nav _nav; + private Nav2 _nav; public SAXPanel( CommonHelper ch ) { _helper = ch; @@ -170,7 +170,7 @@ tree.addMouseListener( ma ); - _nav = new Nav( this ); + _nav = new Nav2( this ); JPanel bottom_panel = new JPanel( new LambdaLayout() ); add( bottom_panel, BorderLayout.SOUTH ); bottom_panel.add( show_attr_mi, "0,0" ); File [changed]: SAXTreeModel.java Url: http://antelope.tigris.org/source/browse/antelope/src/ise/antelope/common/SAXTreeModel.java?r1=1.7&r2=1.8 Delta lines: +5 -4 ------------------- --- SAXTreeModel.java 19 May 2004 19:13:02 -0000 1.7 +++ SAXTreeModel.java 30 Jul 2004 03:21:40 -0000 1.8 @@ -160,10 +160,9 @@ if ( child.isTarget() ) list.put( child.getAttributeValue( "name" ), child ); // add subproject targets - if ( child.isProject() ) + else if ( child.isProject() ) addSubProjectTargets( child, list ); } - return list; } @@ -175,10 +174,12 @@ while ( en.hasMoreElements() ) { SAXTreeNode child = ( SAXTreeNode ) en.nextElement(); // add target directly - if ( child.isTarget() ) + if ( child.isTarget() ) { + String name = getPQName(child); list.put( getPQName(child), child ); + } // add subproject targets - if ( child.isProject() ) + else if ( child.isProject() ) addSubProjectTargets( child, list ); } } File [changed]: version.txt Url: http://antelope.tigris.org/source/browse/antelope/src/ise/antelope/common/version.txt?r1=1.32&r2=1.33 Delta lines: +2 -2 ------------------- --- version.txt 6 Jun 2004 11:09:56 -0000 1.32 +++ version.txt 30 Jul 2004 03:21:40 -0000 1.33 @@ -1,2 +1,2 @@ -VERSION=3.1.8 -DATE=June 6 2004 \ No newline at end of file +VERSION=3.1.9 +DATE=July 29 2004 \ No newline at end of file Directory: /antelope/src/ise/antelope/tasks/ ============================================ File [changed]: PostTask.java Url: http://antelope.tigris.org/source/browse/antelope/src/ise/antelope/tasks/PostTask.java?r1=1.2&r2=1.3 Delta lines: +9 -2 ------------------- --- PostTask.java 22 Mar 2004 23:40:36 -0000 1.2 +++ PostTask.java 30 Jul 2004 03:21:41 -0000 1.3 @@ -65,6 +65,7 @@ import java.net.URLConnection; import java.net.URLDecoder; import java.net.URLEncoder; +import java.net.HttpURLConnection; import java.util.Enumeration; import java.util.Hashtable; @@ -88,7 +89,7 @@ * and the appropriate property values will be filled in at run time. * * @author Dale Anson, danson@germane-software.com - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class PostTask extends Task { @@ -331,6 +332,12 @@ FileWriter fw = null; BufferedReader in = null; try { + if (connection instanceof HttpURLConnection) { + if(verbose) { + log(String.valueOf(((HttpURLConnection)connection).getResponseCode())); + log(((HttpURLConnection)connection).getResponseMessage()); + } + } in = new BufferedReader( new InputStreamReader( connection.getInputStream() ) ); if ( log != null ) { @@ -341,7 +348,7 @@ if ( currentRunner != this ) { break; } - line = URLDecoder.decode( line, "UTF-8" ); + //line = URLDecoder.decode( line, "UTF-8" ); if ( verbose ) { log( line ); } Directory: /antelope/src/ise/library/ ===================================== File [changed]: Nav.java Url: http://antelope.tigris.org/source/browse/antelope/src/ise/library/Nav.java?r1=1.3&r2=1.4 Delta lines: +11 -0 -------------------- --- Nav.java 30 May 2004 14:20:52 -0000 1.3 +++ Nav.java 30 Jul 2004 03:21:42 -0000 1.4 @@ -51,16 +51,23 @@ public Nav( Navable client ) { if ( client == null ) throw new IllegalArgumentException( "client cannot be null" ); + System.out.println(">>>>>>>>>> 1"); this.client = client; setFloatable( false ); putClientProperty( "JToolBar.isRollover", Boolean.TRUE ); + System.out.println(">>>>>>>>>> 2"); // set up the buttons + try { back = new JButton(); + System.out.println(">>>>>>>>>> 3"); + System.out.println("made the back button"); java.net.URL url = getClass().getClassLoader().getResource( "images/Back16.gif" ); + System.out.println("the back icon url is " + url); Icon icon = null; if ( url != null ) icon = new ImageIcon( url ); + System.out.println("the back icon is " + icon); if (icon != null) back.setIcon( icon ); else @@ -84,6 +91,10 @@ forward.addActionListener( this ); add( back ); add( forward ); + } + catch(Exception e) { + e.printStackTrace(); + } // set up the history stacks backStack = new Stack(); --------------------------------------------------------------------- To unsubscribe, e-mail: cvs-unsubscribe@antelope.tigris.org For additional commands, e-mail: cvs-help@antelope.tigris.org

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

Messages

Show all messages in topic

CVS update: /antelope/, /antelope/src/docs/, /antelope/src/ise/antelope/app/, /antelope/src/ise/antelope/common/, /antelope/src/ise/antelope/tasks/, /antelope/src/ise/library/ danson Dale Anson 2004-07-29 20:21:42 PDT
Messages per page: