cdchamber-cvscommit Mailing List for CDChamber (Page 8)

Status: Pre-Alpha

Brought to you by: crystal_y, simon_lei

cdchamber-cvscommit — Mailing list for CVS commit messages.

You can subscribe to this list here.

2002	_Jan	_Feb	_Mar	_Apr	_May	_Jun (111)	_Jul (258)	_Aug (21)	_Sep	_Oct	_Nov	_Dec
2003	_Jan	_Feb	_Mar	_Apr (1)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 6 7 8 9 10 .. 16 > >> (Page 8 of 16)

[CDChamber-cvscommit] CDChamber/aspect/gen/org/cdchamber/elements - New directory

From: <cry...@us...> - 2002-07-22 08:27:04

Update of /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv21866/elements

Log Message:
Directory /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements added to the repository

[CDChamber-cvscommit] CDChamber/aspect/gen/org/cdchamber/parser - New directory

From: <cry...@us...> - 2002-07-22 08:27:04

Update of /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/parser
In directory usw-pr-cvs1:/tmp/cvs-serv21866/parser

Log Message:
Directory /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/parser added to the repository

[CDChamber-cvscommit] CDChamber/aspect/gen/org/cdchamber - New directory

From: <cry...@us...> - 2002-07-22 08:26:47

Update of /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber
In directory usw-pr-cvs1:/tmp/cvs-serv21770/cdchamber

Log Message:
Directory /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber added to the repository

[CDChamber-cvscommit] CDChamber/aspect/gen/org - New directory

From: <cry...@us...> - 2002-07-22 08:26:07

Update of /cvsroot/cdchamber/CDChamber/aspect/gen/org
In directory usw-pr-cvs1:/tmp/cvs-serv21521/org

Log Message:
Directory /cvsroot/cdchamber/CDChamber/aspect/gen/org added to the repository

[CDChamber-cvscommit] CDChamber/aspect/gen - New directory

From: <cry...@us...> - 2002-07-22 08:25:56

Update of /cvsroot/cdchamber/CDChamber/aspect/gen
In directory usw-pr-cvs1:/tmp/cvs-serv21379/gen

Log Message:
Directory /cvsroot/cdchamber/CDChamber/aspect/gen added to the repository

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/elements CDRomType.java,1.1,1.2

From: <sim...@us...> - 2002-07-22 06:45:24

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv14944/src/org/cdchamber/elements

Modified Files:
	CDRomType.java 
Log Message:
Bug Fix. Close all writer after the marshall.

Index: CDRomType.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/elements/CDRomType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CDRomType.java	22 Jul 2002 02:49:19 -0000	1.1
--- CDRomType.java	22 Jul 2002 06:45:19 -0000	1.2
***************
*** 1,36 ****
  /*   Generated by AspectJ version 1.0.4 */
  package org.cdchamber.elements;
  import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.ValidationException;
  import java.io.*;
  
  public class CDRomType extends DirectoryType {
!   public String getDataFileName() {
!     return this.dataFileName;
!   } 
  
!   public void setDataFileName(String dataFileName) {
!     this.dataFileName = dataFileName;
!   } 
  
!   public void delete() {
!     File dataFile = new File(this.dataFileName);
!     dataFile.delete();
!   } 
  
!   private String dataFileName;
!   public CDRomType(DirectoryType dir) {
!     super();
!     this.setContent(dir.getContent());
!     this.setDate(dir.getDate());
!     this.setDesc(dir.getDesc());
!     this.setFiles(dir.getFiles());
!     this.setName(dir.getName());
!     this.setSize(dir.getSize());
!   } 
!   public void marshal() throws MarshalException, ValidationException, IOException {
!     Writer out = new FileWriter(this.getDataFileName());
!     super.marshal(out);
!   } 
  
! } 
\ No newline at end of file
--- 1,41 ----
  /*   Generated by AspectJ version 1.0.4 */
  package org.cdchamber.elements;
+ 
  import org.exolab.castor.xml.MarshalException;
  import org.exolab.castor.xml.ValidationException;
+ 
  import java.io.*;
  
  public class CDRomType extends DirectoryType {
!     public String getDataFileName() {
!         return this.dataFileName;
!     }
  
!     public void setDataFileName(String dataFileName) {
!         this.dataFileName = dataFileName;
!     }
  
!     public void delete() {
!         File dataFile = new File(this.dataFileName);
!         dataFile.delete();
!     }
  
!     private String dataFileName;
  
!     public CDRomType(DirectoryType dir) {
!         super();
!         this.setContent(dir.getContent());
!         this.setDate(dir.getDate());
!         this.setDesc(dir.getDesc());
!         this.setFiles(dir.getFiles());
!         this.setName(dir.getName());
!         this.setSize(dir.getSize());
!     }
! 
!     public void marshal() throws MarshalException, ValidationException, IOException {
!         Writer out = new FileWriter(this.getDataFileName());
!         super.marshal(out);
!         out.close();
!     }
! 
! }
\ No newline at end of file

[CDChamber-cvscommit] CDChamber build.xml,1.28,1.29

From: <sim...@us...> - 2002-07-22 06:45:24

Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv14944

Modified Files:
	build.xml 
Log Message:
Bug Fix. Close all writer after the marshall.

Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** build.xml	22 Jul 2002 05:28:17 -0000	1.28
--- build.xml	22 Jul 2002 06:45:19 -0000	1.29
***************
*** 117,121 ****
              </classpath>
              <formatter type="plain" usefile="false"/>
-             <formatter type="xml"/>
              <batchtest todir="${junit.results}">
                  <fileset dir="${test.classes}" includes="org/cdchamber/gui/CDCMainFrameControllerTest.class"/>
--- 117,120 ----
***************
*** 125,134 ****
  
      <target name="test.run" depends="test.compile" description="Run unit tests">
!         <junit fork="yes" haltonfailure="yes" dir=".">
              <classpath>
                  <path refid="classpath" />
              </classpath>
              <formatter type="plain" usefile="false"/>
-             <formatter type="xml"/>
              <batchtest todir="${junit.results}">
                  <fileset dir="${test.classes}" includes="**/*Test.class"/>
--- 124,132 ----
  
      <target name="test.run" depends="test.compile" description="Run unit tests">
!         <junit fork="true" haltonfailure="yes" dir=".">
              <classpath>
                  <path refid="classpath" />
              </classpath>
              <formatter type="plain" usefile="false"/>
              <batchtest todir="${junit.results}">
                  <fileset dir="${test.classes}" includes="**/*Test.class"/>

[CDChamber-cvscommit] CDChamber/test/src/org/cdchamber/gui CDCMainFrameControllerTest.java,1.11,1.12

From: <sim...@us...> - 2002-07-22 06:45:24

Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv14944/test/src/org/cdchamber/gui

Modified Files:
	CDCMainFrameControllerTest.java 
Log Message:
Bug Fix. Close all writer after the marshall.

Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CDCMainFrameControllerTest.java	22 Jul 2002 02:41:01 -0000	1.11
--- CDCMainFrameControllerTest.java	22 Jul 2002 06:45:19 -0000	1.12
***************
*** 36,39 ****
--- 36,41 ----
      protected void tearDown() throws Exception {
          super.tearDown();
+         frame=null;
+         controller=null;
          File dataDir = new File( DirPath.DataDir);
          String[] newFiles = dataDir.list( new XmlFilenameFilter());
***************
*** 54,58 ****
      private void removeFile( String name) throws Exception{
          File file = new File( DirPath.DataDir + DirPath.SEP + name);
!         if ( !file.delete()) throw new Exception( "Can't remove file:" + name);
      }
  
--- 56,60 ----
      private void removeFile( String name) throws Exception{
          File file = new File( DirPath.DataDir + DirPath.SEP + name);
!         if ( !file.delete()) throw new Exception( "Can't remove file:" + file.getAbsolutePath());
      }
  
***************
*** 127,133 ****
          action = controller.getDeleteCDRomAction();
          action.actionPerformed(null);
!         // TODO: Can't delete file immediately under unix.
!         // comment the assert, need to be solved.
!         //assertTrue( "Should delete the new data file", !hasNewerData());
      }
  
--- 129,133 ----
          action = controller.getDeleteCDRomAction();
          action.actionPerformed(null);
!         assertTrue( "Should delete the new data file", !hasNewerData());
      }
  
***************
*** 175,179 ****
          if ( nullFile) return null;
          if ( wrongFile) return "/no/such/file";
!         return DirPath.DataDir + DirPath.SEP + "result.xml";
      }
  
--- 175,179 ----
          if ( nullFile) return null;
          if ( wrongFile) return "/no/such/file";
!         return DirPath.BaseDir + DirPath.SEP + "/acceptance/case1/check/repository.xml";
      }

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/gui CDCMainFrameController.java,1.9,1.10

From: <sim...@us...> - 2002-07-22 06:45:24

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv14944/src/org/cdchamber/gui

Modified Files:
	CDCMainFrameController.java 
Log Message:
Bug Fix. Close all writer after the marshall.

Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CDCMainFrameController.java	21 Jul 2002 12:06:25 -0000	1.9
--- CDCMainFrameController.java	22 Jul 2002 06:45:19 -0000	1.10
***************
*** 93,97 ****
              try {
                  dirType.parse( dirName);
!                 dirType.marshal( new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml"));
                  frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
              } catch (Exception e1) {
--- 93,99 ----
              try {
                  dirType.parse( dirName);
!                 FileWriter out = new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml");
!                 dirType.marshal( out);
!                 out.close();
                  frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
              } catch (Exception e1) {
***************
*** 114,118 ****
              try {
                  DirectoryType dirType = DirectoryType.unmarshalDirectoryType( new FileReader( fileName));
!                 dirType.marshal( new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml"));
                  frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
              } catch (Exception e1) {
--- 116,122 ----
              try {
                  DirectoryType dirType = DirectoryType.unmarshalDirectoryType( new FileReader( fileName));
!                 FileWriter out = new FileWriter( DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml");
!                 dirType.marshal( out);
!                 out.close();
                  frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
              } catch (Exception e1) {

[CDChamber-cvscommit] CDChamber build.xml,1.27,1.28

From: <cry...@us...> - 2002-07-22 05:28:24

Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv26387

Modified Files:
	build.xml 
Log Message:
bug fix


Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** build.xml	22 Jul 2002 03:03:50 -0000	1.27
--- build.xml	22 Jul 2002 05:28:17 -0000	1.28
***************
*** 81,86 ****
  
      <target name="ajc_gen" depends="castor_gen" unless="ajc_gen.notRequired">
!         <ajc destdir="${aspect.classes}" 
!         preprocess="yes"  workingdir="${src.dir}" nocomments="yes">
              <src>
                  <pathelement path="${aspect.src}/org"/>
--- 81,85 ----
  
      <target name="ajc_gen" depends="castor_gen" unless="ajc_gen.notRequired">
!         <ajc preprocess="yes"  workingdir="${src.dir}" nocomments="yes">
              <src>
                  <pathelement path="${aspect.src}/org"/>

[CDChamber-cvscommit] CDChamber/aspect/src AspectCDCMainFrameControllerTest.java,NONE,1.1

From: <cry...@us...> - 2002-07-22 03:04:08

Update of /cvsroot/cdchamber/CDChamber/aspect/src
In directory usw-pr-cvs1:/tmp/cvs-serv26260/src

Added Files:
	AspectCDCMainFrameControllerTest.java 
Log Message:
use aspect to debug

--- NEW FILE: AspectCDCMainFrameControllerTest.java ---
import java.io.*;
import org.cdchamber.gui.*;
import org.cdchamber.util.DirPath;

public aspect AspectCDCMainFrameControllerTest {
  pointcut entry(): cflowbelow(call(void testDeleteCDRomAction())) && call(void actionPerformed(..));

  void printFiles() {

    File dataDir = new File( DirPath.DataDir);
    File[] newFiles = dataDir.listFiles(new XmlFilenameFilter() );
        for ( int i = 0; i < newFiles.length; i++ ) {
          System.out.println(newFiles[i].getName() + " " + newFiles[i].exists() );          
        } // end of for ()

  }

  before():entry() {
    System.out.println("before actionPerformed");
    printFiles();

  }
  after():entry() {
    System.out.println("after actionPerformed");
    printFiles();
    

  }

}

class XmlFilenameFilter implements FilenameFilter {
    public boolean accept(File dir, String name) {
        if ( name.toLowerCase().endsWith(".xml")) return true;
        return false;
    }
}

[CDChamber-cvscommit] CDChamber/aspect file.lst,1.6,1.7

From: <cry...@us...> - 2002-07-22 03:04:07

Update of /cvsroot/cdchamber/CDChamber/aspect
In directory usw-pr-cvs1:/tmp/cvs-serv26260

Added Files:
	file.lst 
Log Message:
use aspect to debug

[CDChamber-cvscommit] CDChamber build.xml,1.26,1.27

From: <cry...@us...> - 2002-07-22 03:03:57

Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv26164

Modified Files:
	build.xml 
Log Message:
use aspect to debug

Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** build.xml	19 Jul 2002 02:00:51 -0000	1.26
--- build.xml	22 Jul 2002 03:03:50 -0000	1.27
***************
*** 25,29 ****
      <path id="classpath">
          <pathelement path="${basedir}/lib" />
-         <pathelement path="${aspect.classes}" />
          <pathelement path="${test.classes}" />
          <pathelement path="${build.dest}" />
--- 25,28 ----
***************
*** 54,60 ****
              </and>
          </condition>
!         <condition property="ajc.notRequired">
                 <uptodate targetfile="${src.dir}/org/cdchamber/elements/FileType.java">
!                    <srcfiles dir="${aspect.src}" includes="**/*.*"/>
                 </uptodate>
          </condition>
--- 53,65 ----
              </and>
          </condition>
!         <condition property="ajc_gen.notRequired">
                 <uptodate targetfile="${src.dir}/org/cdchamber/elements/FileType.java">
!                    <srcfiles dir="${aspect.src}/org" includes="**/*.*"/>
!                </uptodate>
!         </condition>
!         <condition property="ajc.notRequired">
!                <uptodate targetfile="${aspect.classes}/AspectCDCMainFrameControllerTest.class">
!                    <srcfiles dir="${aspect.src}" includes="*.*"/>
!                    <srcfiles dir="${aspect.dir}" includes="file.lst"/>
                 </uptodate>
          </condition>
***************
*** 75,83 ****
  
  
!     <target name="ajc_gen" depends="castor_gen" unless="ajc.notRequired">
          <ajc destdir="${aspect.classes}" 
          preprocess="yes"  workingdir="${src.dir}" nocomments="yes">
              <src>
!                 <pathelement path="${aspect.src}"/>
              </src>
          </ajc>
--- 80,88 ----
  
  
!     <target name="ajc_gen" depends="castor_gen" unless="ajc_gen.notRequired">
          <ajc destdir="${aspect.classes}" 
          preprocess="yes"  workingdir="${src.dir}" nocomments="yes">
              <src>
!                 <pathelement path="${aspect.src}/org"/>
              </src>
          </ajc>
***************
*** 96,99 ****
--- 101,126 ----
              <include name="**/*.java"/>
          </javac>
+     </target>
+ 
+     <target name="ajc" depends="test.compile" unless="ajc.notRequired">
+         <ajc destdir="${aspect.classes}" argfiles="${aspect.dir}/file.lst">
+ 		    <classpath>
+                 <path refid="classpath" />
+ 		    </classpath>
+         </ajc>
+     </target>
+ 
+     <target name="ajrun" depends="ajc" description="Run debugging unit tests">
+         <junit fork="yes" haltonfailure="yes" dir=".">
+             <classpath>
+ 				<pathelement location="${aspect.classes}" />
+                 <path refid="classpath" />
+             </classpath>
+             <formatter type="plain" usefile="false"/>
+             <formatter type="xml"/>
+             <batchtest todir="${junit.results}">
+                 <fileset dir="${test.classes}" includes="org/cdchamber/gui/CDCMainFrameControllerTest.class"/>
+             </batchtest>
+         </junit>
      </target>

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/elements CDRomType.java,NONE,1.1

From: <sim...@us...> - 2002-07-22 02:49:21

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv23197/src/org/cdchamber/elements

Added Files:
	CDRomType.java 
Log Message:
Refactor the CDRomType

--- NEW FILE: CDRomType.java ---
/*   Generated by AspectJ version 1.0.4 */
package org.cdchamber.elements;
import org.exolab.castor.xml.MarshalException;
import org.exolab.castor.xml.ValidationException;
import java.io.*;

public class CDRomType extends DirectoryType {
  public String getDataFileName() {
    return this.dataFileName;
  } 

  public void setDataFileName(String dataFileName) {
    this.dataFileName = dataFileName;
  } 

  public void delete() {
    File dataFile = new File(this.dataFileName);
    dataFile.delete();
  } 

  private String dataFileName;
  public CDRomType(DirectoryType dir) {
    super();
    this.setContent(dir.getContent());
    this.setDate(dir.getDate());
    this.setDesc(dir.getDesc());
    this.setFiles(dir.getFiles());
    this.setName(dir.getName());
    this.setSize(dir.getSize());
  } 
  public void marshal() throws MarshalException, ValidationException, IOException {
    Writer out = new FileWriter(this.getDataFileName());
    super.marshal(out);
  } 

}

[CDChamber-cvscommit] CDChamber/aspect/src/org/cdchamber/elements CDRomType.java,1.4,NONE

From: <sim...@us...> - 2002-07-22 02:49:21

Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv23197/aspect/src/org/cdchamber/elements

Removed Files:
	CDRomType.java 
Log Message:
Refactor the CDRomType

--- CDRomType.java DELETED ---

[CDChamber-cvscommit] CDChamber/test/src/org/cdchamber/gui CDCMainFrameControllerTest.java,1.10,1.11

From: <sim...@us...> - 2002-07-22 02:41:05

Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv21394/test/src/org/cdchamber/gui

Modified Files:
	CDCMainFrameControllerTest.java 
Log Message:
Comment the assert for file.delete assert fail on unix.

Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CDCMainFrameControllerTest.java	21 Jul 2002 12:06:25 -0000	1.10
--- CDCMainFrameControllerTest.java	22 Jul 2002 02:41:01 -0000	1.11
***************
*** 127,131 ****
          action = controller.getDeleteCDRomAction();
          action.actionPerformed(null);
!         assertTrue( "Should delete the new data file", !hasNewerData());
      }
  
--- 127,133 ----
          action = controller.getDeleteCDRomAction();
          action.actionPerformed(null);
!         // TODO: Can't delete file immediately under unix.
!         // comment the assert, need to be solved.
!         //assertTrue( "Should delete the new data file", !hasNewerData());
      }

[CDChamber-cvscommit] CDChamber/script Xml2Html.java,1.3,NONE continuousbuild,1.6,NONE continuousbuild.xml,1.7,NONE

From: <sim...@us...> - 2002-07-22 01:31:28

Update of /cvsroot/cdchamber/CDChamber/script
In directory usw-pr-cvs1:/tmp/cvs-serv7580/script

Removed Files:
	Xml2Html.java continuousbuild continuousbuild.xml 
Log Message:
Remove unnecessary scripts.

--- Xml2Html.java DELETED ---

--- continuousbuild DELETED ---

--- continuousbuild.xml DELETED ---

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/gui FileTreeModel.java,1.4,1.5 FilesTableModel.java,1.6,1.7 XmlFileFilter.java,1.2,1.3

From: <sim...@us...> - 2002-07-22 01:31:28

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv7580/src/org/cdchamber/gui

Modified Files:
	FileTreeModel.java FilesTableModel.java XmlFileFilter.java 
Log Message:
Remove unnecessary scripts.

Index: FileTreeModel.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/FileTreeModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileTreeModel.java	19 Jul 2002 02:07:48 -0000	1.4
--- FileTreeModel.java	22 Jul 2002 01:31:25 -0000	1.5
***************
*** 1,9 ****
  /*
   * Created by IntelliJ IDEA.
!  * User: Administrator
   * Date: Jul 17, 2002
   * Time: 6:24:07 PM
!  * To change template for new class use 
!  * Code Style | Class Templates options (Tools | IDE Options).
   */
  package org.cdchamber.gui;
--- 1,8 ----
  /*
   * Created by IntelliJ IDEA.
!  * User: Simon
   * Date: Jul 17, 2002
   * Time: 6:24:07 PM
!  * $Id$
   */
  package org.cdchamber.gui;

Index: FilesTableModel.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/FilesTableModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FilesTableModel.java	21 Jul 2002 13:23:58 -0000	1.6
--- FilesTableModel.java	22 Jul 2002 01:31:25 -0000	1.7
***************
*** 1,9 ****
  /*
   * Created by IntelliJ IDEA.
!  * User: Administrator
   * Date: Jul 17, 2002
   * Time: 9:06:20 PM
!  * To change template for new class use 
!  * Code Style | Class Templates options (Tools | IDE Options).
   */
  package org.cdchamber.gui;
--- 1,8 ----
  /*
   * Created by IntelliJ IDEA.
!  * User: Simon
   * Date: Jul 17, 2002
   * Time: 9:06:20 PM
!  * $Id$
   */
  package org.cdchamber.gui;

Index: XmlFileFilter.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/XmlFileFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XmlFileFilter.java	19 Jul 2002 04:44:56 -0000	1.2
--- XmlFileFilter.java	22 Jul 2002 01:31:25 -0000	1.3
***************
*** 1,9 ****
  /*
   * Created by IntelliJ IDEA.
!  * User: Administrator
   * Date: Jul 18, 2002
   * Time: 4:38:19 PM
!  * To change template for new class use 
!  * Code Style | Class Templates options (Tools | IDE Options).
   */
  package org.cdchamber.gui;
--- 1,8 ----
  /*
   * Created by IntelliJ IDEA.
!  * User: Simon
   * Date: Jul 18, 2002
   * Time: 4:38:19 PM
!  * $Id$
   */
  package org.cdchamber.gui;

[CDChamber-cvscommit] CDChamber/test/src/org/cdchamber/gui CDCMainFrameTest.java,1.9,1.10

From: <sim...@us...> - 2002-07-21 13:24:01

Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv17398/test/src/org/cdchamber/gui

Modified Files:
	CDCMainFrameTest.java 
Log Message:
User can change the filetype's describe and save them.

Index: CDCMainFrameTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CDCMainFrameTest.java	18 Jul 2002 08:22:26 -0000	1.9
--- CDCMainFrameTest.java	21 Jul 2002 13:23:59 -0000	1.10
***************
*** 78,80 ****
--- 78,90 ----
          if ( !selected.equals( tableModel.getDir())) fail( "The selected directory should be the table's directory");
      }
+ 
+     public void testTableColumnsUnchangable() {
+         assertTrue( "Can't change value at name column", !frame.filesTable.getModel().isCellEditable( 0, FilesTableModel.NAME));
+         assertTrue( "Can't change value at size column", !frame.filesTable.getModel().isCellEditable( 0, FilesTableModel.SIZE));
+         assertTrue( "Can't change value at date column", !frame.filesTable.getModel().isCellEditable( 0, FilesTableModel.DATE));
+     }
+ 
+     public void testTableDescChangable() {
+         assertTrue( "Can change value at desc column", frame.filesTable.getModel().isCellEditable( 0, FilesTableModel.DESC));
+     }
  }

[CDChamber-cvscommit] CDChamber/data result.xml,1.1,1.2

From: <sim...@us...> - 2002-07-21 13:24:01

Update of /cvsroot/cdchamber/CDChamber/data
In directory usw-pr-cvs1:/tmp/cvs-serv17398/data

Modified Files:
	result.xml 
Log Message:
User can change the filetype's describe and save them.

Index: result.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/data/result.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** result.xml	18 Jul 2002 01:32:51 -0000	1.1
--- result.xml	21 Jul 2002 13:23:58 -0000	1.2
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <directory-type files-count="3" date="1025147775000" size="9525" valid="true"><name>testcase</name><files files-count="2" date="1025069812000" size="9525" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>testtools</name><files files-count="2" date="1025149792000" size="4763" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>difffiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2382" valid="true"><name>file2.txt</name></files><content></content></files><files files-count="2" date="1025069812000" size="4762" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>samefiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2381" valid="true"><name>file2.txt</name></files><content></content></files><content></content></files><files date="1024999342000" size="0" valid="true"><name>nullFile</name></files><files files-count="0" date="1025086602000" size="0" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>nulldir</name><content></content></files><content></content></directory-type>
! 
! 
--- 1,2 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <CDRomType valid="true" date="1025147775000" files-count="3" size="9525"><files files-count="2" date="1025069812000" size="9525" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>testtools</name><files files-count="2" date="1025149792000" size="4763" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>difffiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2382" valid="true"><name>file2.txt</name></files><content></content></files><files files-count="2" date="1025069812000" size="4762" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>samefiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2381" valid="true"><name>file2.txt</name></files><content></content></files><content></content></files><files date="1024999342000" size="0" valid="true"><name>nullFile</name></files><files files-count="0" date="1025086602000" size="0" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>nulldir</name><content></content></files><name>testcase</name><desc>zzz</desc><content></content><data-file-name>D:\work\CDChamber\data\result.xml</data-file-name></CDRomType>
\ No newline at end of file

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/gui FilesTableModel.java,1.5,1.6

From: <sim...@us...> - 2002-07-21 13:24:01

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv17398/src/org/cdchamber/gui

Modified Files:
	FilesTableModel.java 
Log Message:
User can change the filetype's describe and save them.

Index: FilesTableModel.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/FilesTableModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FilesTableModel.java	19 Jul 2002 02:07:48 -0000	1.5
--- FilesTableModel.java	21 Jul 2002 13:23:58 -0000	1.6
***************
*** 74,77 ****
--- 74,92 ----
      }
  
+     public boolean isCellEditable(int row, int col) {
+         if ( col == DESC) return true;
+         return false;
+     }
+ 
+     public void setValueAt(Object value, int row, int col) {
+         if ( row<0 || row > dir.getFilesCount()-1) return;
+         if ( col != DESC) return;
+ 
+         // TODO: Maybe not right after sort.
+         FileType ft = dir.getFiles( row);
+         ft.setDesc( value.toString());
+         fireTableCellUpdated(row, col);
+     }
+ 
      private static long KB=1024;
      private static NumberFormat nf = NumberFormat.getNumberInstance();

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/gui CDCMainFrame.java,1.16,1.17 CDCMainFrameController.java,1.8,1.9

From: <sim...@us...> - 2002-07-21 12:06:36

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv27496/src/org/cdchamber/gui

Modified Files:
	CDCMainFrame.java CDCMainFrameController.java 
Log Message:
User can save cdrom data file now.

Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CDCMainFrame.java	21 Jul 2002 11:20:12 -0000	1.16
--- CDCMainFrame.java	21 Jul 2002 12:06:25 -0000	1.17
***************
*** 22,25 ****
--- 22,26 ----
      JMenuItem cdromImportMenuItem = new JMenuItem();
      JMenuItem cdromDeleteMenuItem = new JMenuItem();
+     JMenuItem cdromSaveMenuItem = new JMenuItem();
      JMenu helpMenu = new JMenu();
      JMenuItem helpAboutMenuItem = new JMenuItem();
***************
*** 104,107 ****
--- 105,109 ----
          cdromImportMenuItem.setAction( controller.getImportCDRomAction());
          cdromDeleteMenuItem.setAction( controller.getDeleteCDRomAction());
+         cdromSaveMenuItem.setAction( controller.getSaveCDRomAction());
          helpMenu.setMnemonic('H');
          helpMenu.setText("Help");
***************
*** 120,123 ****
--- 122,126 ----
          cdromMenu.add(cdromImportMenuItem);
          cdromMenu.add(cdromDeleteMenuItem);
+         cdromMenu.add(cdromSaveMenuItem);
          helpMenu.add(helpAboutMenuItem);
          cdromMenu.addSeparator();

Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CDCMainFrameController.java	20 Jul 2002 08:55:56 -0000	1.8
--- CDCMainFrameController.java	21 Jul 2002 12:06:25 -0000	1.9
***************
*** 1,9 ****
  /*
!  * Created by IntelliJ IDEA.
!  * User: Administrator
   * Date: Jul 18, 2002
   * Time: 11:05:00 AM
!  * To change template for new class use 
!  * Code Style | Class Templates options (Tools | IDE Options).
   */
  package org.cdchamber.gui;
--- 1,7 ----
  /*
!  * User: Simon
   * Date: Jul 18, 2002
   * Time: 11:05:00 AM
!  * $Id$
   */
  package org.cdchamber.gui;
***************
*** 12,15 ****
--- 10,15 ----
  import org.cdchamber.elements.CDRomType;
  import org.cdchamber.util.DirPath;
+ import org.exolab.castor.xml.MarshalException;
+ import org.exolab.castor.xml.ValidationException;
  
  import javax.swing.event.TreeSelectionEvent;
***************
*** 77,80 ****
--- 77,84 ----
      }
  
+     public Action getSaveCDRomAction() {
+         return new SaveCDRomAction();
+     }
+ 
      public class CreateNewCDRomAction extends AbstractAction {
          public CreateNewCDRomAction() {
***************
*** 133,135 ****
--- 137,160 ----
          }
      }
+ 
+     public class SaveCDRomAction extends AbstractAction {
+         public SaveCDRomAction() {
+             putValue( Action.NAME, "Save");
+             putValue( Action.MNEMONIC_KEY, new Integer('S'));
+         }
+ 
+         public void actionPerformed(ActionEvent e) {
+             if ( selectedNode == null) return;
+             if ( selectedNode.isRoot()) return;
+ 
+             DefaultMutableTreeNode cdromNode = (DefaultMutableTreeNode)selectedNode.getPath()[1];
+             CDRomType cdrom = (CDRomType)( cdromNode.getUserObject());
+             try {
+                 cdrom.marshal();
+             } catch ( Exception e1) {
+                 frame.dealWithActionException( "Can't save cdrom file.", e1);
+             }
+         }
+     }
+ 
  }

[CDChamber-cvscommit] CDChamber/test/src/org/cdchamber/gui CDCMainFrameControllerTest.java,1.9,1.10

From: <sim...@us...> - 2002-07-21 12:06:36

Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv27496/test/src/org/cdchamber/gui

Modified Files:
	CDCMainFrameControllerTest.java 
Log Message:
User can save cdrom data file now.

Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CDCMainFrameControllerTest.java	21 Jul 2002 10:28:42 -0000	1.9
--- CDCMainFrameControllerTest.java	21 Jul 2002 12:06:25 -0000	1.10
***************
*** 12,15 ****
--- 12,16 ----
  
  import org.cdchamber.util.DirPath;
+ import org.cdchamber.elements.CDRomType;
  
  import java.io.File;
***************
*** 127,130 ****
--- 128,152 ----
          action.actionPerformed(null);
          assertTrue( "Should delete the new data file", !hasNewerData());
+     }
+ 
+     public void testSaveCDRomAction() throws Exception {
+         JTree jTree = new JTree();
+         jTree.setModel( frame.treeModel);
+         jTree.addTreeSelectionListener( controller);
+         jTree.setSelectionRow( 0);
+         jTree.setSelectionRow( 1);
+ 
+         Action action = controller.getSaveCDRomAction();
+         Object root = frame.treeModel.getRoot();
+         DefaultMutableTreeNode child = (DefaultMutableTreeNode)frame.treeModel.getChild( root, 0);
+         CDRomType cdrom = (CDRomType) child.getUserObject();
+ 
+         String filePath = cdrom.getDataFileName();
+         File file = new File( filePath);
+         long beforeTime = file.lastModified();
+ 
+         action.actionPerformed(null);
+         long afterTime = file.lastModified();
+         assertTrue( "Should have act the save action.", beforeTime < afterTime);
      }

[CDChamber-cvscommit] CDChamber/aspect/src/org/cdchamber/elements CDRomType.java,1.3,1.4

From: <sim...@us...> - 2002-07-21 12:06:35

Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv27496/aspect/src/org/cdchamber/elements

Modified Files:
	CDRomType.java 
Log Message:
User can save cdrom data file now.

Index: CDRomType.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements/CDRomType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CDRomType.java	21 Jul 2002 11:32:02 -0000	1.3
--- CDRomType.java	21 Jul 2002 12:06:25 -0000	1.4
***************
*** 5,8 ****
--- 5,11 ----
  package org.cdchamber.elements;
  
+ import org.exolab.castor.xml.MarshalException;
+ import org.exolab.castor.xml.ValidationException;
+ 
  import java.io.*;
  
***************
*** 33,41 ****
      }
  
! /*
      public void marshal() throws MarshalException, ValidationException, IOException {
!         Writer out = new FileWriter( DirPath.DataDir + DirPath.SEP + getDataFileName());
          super.marshal(out);
      }
! */
  }
--- 36,44 ----
      }
  
! 
      public void marshal() throws MarshalException, ValidationException, IOException {
!         Writer out = new FileWriter( getDataFileName());
          super.marshal(out);
      }
! 
  }

[CDChamber-cvscommit] CDChamber/aspect/src/org/cdchamber/elements CDRomType.java,1.2,1.3

From: <sim...@us...> - 2002-07-21 11:32:06

Update of /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv18738/aspect/src/org/cdchamber/elements

Modified Files:
	CDRomType.java 
Log Message:
Bug Fix.

Index: CDRomType.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/src/org/cdchamber/elements/CDRomType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CDRomType.java	21 Jul 2002 11:20:12 -0000	1.2
--- CDRomType.java	21 Jul 2002 11:32:02 -0000	1.3
***************
*** 5,11 ****
  package org.cdchamber.elements;
  
- import org.exolab.castor.xml.*;
- import org.cdchamber.util.DirPath;
- 
  import java.io.*;
  
--- 5,8 ----
***************
*** 36,42 ****
--- 33,41 ----
      }
  
+ /*
      public void marshal() throws MarshalException, ValidationException, IOException {
          Writer out = new FileWriter( DirPath.DataDir + DirPath.SEP + getDataFileName());
          super.marshal(out);
      }
+ */
  }

Flat | Threaded

<< < 1 .. 6 7 8 9 10 .. 16 > >> (Page 8 of 16)

2002	Jan	Feb	Mar	Apr	May	Jun (111)	Jul (258)	Aug (21)	Sep	Oct	Nov	Dec
2003	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec