Menu
▾
▴
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
|
|
From: <sim...@us...> - 2002-07-26 10:10:56
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv24559/test/src/org/cdchamber/elements
Modified Files:
DirectoryTypeTest.java
Log Message:
Add new constructor in FileTypes.
Index: DirectoryTypeTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements/DirectoryTypeTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DirectoryTypeTest.java 17 Jul 2002 09:29:59 -0000 1.11
--- DirectoryTypeTest.java 26 Jul 2002 10:10:52 -0000 1.12
***************
*** 12,16 ****
import java.io.File;
- import java.util.Date;
public class DirectoryTypeTest extends TestCase {
--- 12,15 ----
|
Update of /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv24559/aspect/gen/org/cdchamber/elements
Modified Files:
CompressedFileType.java DirectoryTypeWrapper.java
FileTypeFactory.java FileTypeWrapper.java
Log Message:
Add new constructor in FileTypes.
Index: CompressedFileType.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements/CompressedFileType.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompressedFileType.java 26 Jul 2002 09:19:18 -0000 1.1
--- CompressedFileType.java 26 Jul 2002 10:10:51 -0000 1.2
***************
*** 13,25 ****
public class CompressedFileType extends DirectoryType {
public void parse( String fileName) throws FileParseException {
try {
! JarFile file = new JarFile( fileName);
! setName( file.getName());
! setSize( file.size());
! //setDate( file.);
} catch (IOException e) {
}
}
}
--- 13,33 ----
public class CompressedFileType extends DirectoryType {
+ public CompressedFileType( String fileName) {
+
+ }
+
public void parse( String fileName) throws FileParseException {
try {
! File file = new File( fileName);
! setBasicInfo( file);
!
! JarFile jarFile = new JarFile( fileName);
!
!
!
} catch (IOException e) {
}
}
+
}
Index: DirectoryTypeWrapper.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements/DirectoryTypeWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DirectoryTypeWrapper.java 26 Jul 2002 09:19:18 -0000 1.2
--- DirectoryTypeWrapper.java 26 Jul 2002 10:10:51 -0000 1.3
***************
*** 22,30 ****
if ( files[i].getName().equals( "CVS")) continue;
FileType fileType = FileTypeFactory.createFileType( files[i]);
- fileType.parse( files[i].getAbsolutePath());
this.addFiles( fileType);
sumSize += fileType.getSize();
}
this.setSize( sumSize);
}
}
--- 22,34 ----
if ( files[i].getName().equals( "CVS")) continue;
FileType fileType = FileTypeFactory.createFileType( files[i]);
this.addFiles( fileType);
sumSize += fileType.getSize();
}
this.setSize( sumSize);
+ }
+
+ public DirectoryType.new( String fileName) throws FileParseException {
+ this();
+ this.parse( fileName);
}
}
Index: FileTypeFactory.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements/FileTypeFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileTypeFactory.java 26 Jul 2002 09:19:18 -0000 1.2
--- FileTypeFactory.java 26 Jul 2002 10:10:51 -0000 1.3
***************
*** 7,25 ****
package org.cdchamber.elements;
import java.io.File;
public class FileTypeFactory {
! public static FileType createFileType( File file) {
! if ( file.isDirectory()) return new DirectoryType();
! if ( isCompressedFile( file.getName())) return new CompressedFileType();
! return new FileType();
}
private static boolean isCompressedFile( String fileName) {
String lowerName = fileName.toLowerCase();
if ( lowerName.endsWith( ".zip")) return true;
if ( lowerName.endsWith( ".jar")) return true;
return false;
}
}
--- 7,30 ----
package org.cdchamber.elements;
+ import org.cdchamber.parser.FileParseException;
+
import java.io.File;
public class FileTypeFactory {
! public static FileType createFileType( File file) throws FileParseException {
! if ( file.isDirectory()) return new DirectoryType( file.getAbsolutePath());
! if ( isCompressedFile( file.getName())) return new CompressedFileType( file.getAbsolutePath());
! return new FileType( file.getAbsolutePath());
}
private static boolean isCompressedFile( String fileName) {
+ return false;
+ /*
String lowerName = fileName.toLowerCase();
if ( lowerName.endsWith( ".zip")) return true;
if ( lowerName.endsWith( ".jar")) return true;
return false;
+ */
}
}
Index: FileTypeWrapper.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements/FileTypeWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileTypeWrapper.java 22 Jul 2002 08:32:12 -0000 1.1
--- FileTypeWrapper.java 26 Jul 2002 10:10:51 -0000 1.2
***************
*** 9,13 ****
public void FileType.parse( String fileName) throws FileParseException {
File file = new File( fileName);
! if ( !file.exists()) throw new FileParseException( "File not exist"+fileName);
setName( file.getName());
setSize( file.length());
--- 9,17 ----
public void FileType.parse( String fileName) throws FileParseException {
File file = new File( fileName);
! setBasicInfo( file);
! }
!
! public void FileType.setBasicInfo( File file) throws FileParseException {
! if ( !file.exists()) throw new FileParseException( "File not exist"+ file.getName());
setName( file.getName());
setSize( file.length());
***************
*** 17,20 ****
--- 21,29 ----
public String FileType.toString() {
return getName();
+ }
+
+ public FileType.new( String fileName) throws FileParseException {
+ this();
+ this.parse( fileName);
}
}
|
|
From: <sim...@us...> - 2002-07-26 09:19:24
|
Update of /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv10164/aspect/gen/org/cdchamber/elements
Modified Files:
DirectoryTypeWrapper.java FileTypeFactory.java
Added Files:
CompressedFileType.java
Log Message:
Fix the build bug.
Adding the compressed file type.
--- NEW FILE: CompressedFileType.java ---
/*
* User: Simon
* $Id: CompressedFileType.java,v 1.1 2002/07/26 09:19:18 simon_lei Exp $
*/
package org.cdchamber.elements;
import org.cdchamber.parser.FileParseException;
import java.util.jar.JarFile;
import java.io.IOException;
import java.io.File;
public class CompressedFileType extends DirectoryType {
public void parse( String fileName) throws FileParseException {
try {
JarFile file = new JarFile( fileName);
setName( file.getName());
setSize( file.size());
//setDate( file.);
} catch (IOException e) {
}
}
}
Index: DirectoryTypeWrapper.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements/DirectoryTypeWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DirectoryTypeWrapper.java 22 Jul 2002 08:32:12 -0000 1.1
--- DirectoryTypeWrapper.java 26 Jul 2002 09:19:18 -0000 1.2
***************
*** 19,22 ****
--- 19,23 ----
int sumSize = 0;
for ( int i=0; i<files.length; i++) {
+ /* TODO: ignore some type files */
if ( files[i].getName().equals( "CVS")) continue;
FileType fileType = FileTypeFactory.createFileType( files[i]);
Index: FileTypeFactory.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements/FileTypeFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileTypeFactory.java 22 Jul 2002 08:32:12 -0000 1.1
--- FileTypeFactory.java 26 Jul 2002 09:19:18 -0000 1.2
***************
*** 13,17 ****
--- 13,25 ----
public static FileType createFileType( File file) {
if ( file.isDirectory()) return new DirectoryType();
+ if ( isCompressedFile( file.getName())) return new CompressedFileType();
return new FileType();
+ }
+
+ private static boolean isCompressedFile( String fileName) {
+ String lowerName = fileName.toLowerCase();
+ if ( lowerName.endsWith( ".zip")) return true;
+ if ( lowerName.endsWith( ".jar")) return true;
+ return false;
}
}
|
|
From: <sim...@us...> - 2002-07-26 09:19:24
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv10164/src/org/cdchamber/searcher
Modified Files:
Searcher.java
Log Message:
Fix the build bug.
Adding the compressed file type.
Index: Searcher.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher/Searcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Searcher.java 26 Jul 2002 07:16:17 -0000 1.5
--- Searcher.java 26 Jul 2002 09:19:18 -0000 1.6
***************
*** 21,24 ****
--- 21,28 ----
}
+ public void removeAllQuery() {
+ queries.removeAllElements();
+ }
+
public Vector search(FileType[] fileTypes) {
Vector result = new Vector();
|
|
From: <sim...@us...> - 2002-07-26 07:54:38
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv11852/src/org/cdchamber/gui
Modified Files:
CDCMainFrameController.java
Log Message:
Refactor the controller, add one roots in it.
Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CDCMainFrameController.java 26 Jul 2002 06:56:57 -0000 1.13
--- CDCMainFrameController.java 26 Jul 2002 07:54:33 -0000 1.14
***************
*** 25,31 ****
ICDCMainFrame frame;
public CDCMainFrameController( ICDCMainFrame frame) {
this.frame = frame;
! DirectoryType roots = loadDataFiles();
frame.setDirectoryTreeModel( new FileTreeModel( roots));
frame.setFilesTableModel( new FilesTableModel( new DefaultMutableTreeNode(roots)));
--- 25,34 ----
ICDCMainFrame frame;
+ private DefaultMutableTreeNode selectedNode;
+ DirectoryType roots;
+
public CDCMainFrameController( ICDCMainFrame frame) {
this.frame = frame;
! roots = loadDataFiles();
frame.setDirectoryTreeModel( new FileTreeModel( roots));
frame.setFilesTableModel( new FilesTableModel( new DefaultMutableTreeNode(roots)));
***************
*** 54,58 ****
- private DefaultMutableTreeNode selectedNode;
public void valueChanged(TreeSelectionEvent e) {
JTree tree = (JTree)e.getSource();
--- 57,60 ----
***************
*** 99,106 ****
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) {
frame.dealWithActionException( "Create New CDRom Error", e1);
--- 101,111 ----
try {
dirType.parse( dirName);
! String dataFileName = DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml";
! FileWriter out = new FileWriter( dataFileName);
dirType.marshal( out);
out.close();
!
! roots.addFiles( new CDRomType(dirType, dataFileName));
! frame.setDirectoryTreeModel( new FileTreeModel( roots));
} catch (Exception e1) {
frame.dealWithActionException( "Create New CDRom Error", e1);
***************
*** 122,129 ****
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) {
frame.dealWithActionException( "Can't import CDRom data", e1);
--- 127,137 ----
try {
DirectoryType dirType = DirectoryType.unmarshalDirectoryType( new FileReader( fileName));
! String dataFileName = DirPath.DataDir + DirPath.SEP + System.currentTimeMillis() + ".xml";
! FileWriter out = new FileWriter( dataFileName);
dirType.marshal( out);
out.close();
!
! roots.addFiles( new CDRomType(dirType, dataFileName));
! frame.setDirectoryTreeModel( new FileTreeModel( roots));
} catch (Exception e1) {
frame.dealWithActionException( "Can't import CDRom data", e1);
***************
*** 144,147 ****
--- 152,157 ----
CDRomType cdrom = (CDRomType)( cdromNode.getUserObject());
cdrom.delete();
+
+ roots.removeFiles( cdrom);
frame.setDirectoryTreeModel( new FileTreeModel( loadDataFiles()));
}
***************
*** 178,185 ****
if ( searcher.getQueryCount() == 0) return;
! // TODO: Need refactoring.
! DefaultMutableTreeNode root = (DefaultMutableTreeNode)selectedNode.getRoot();
! DirectoryType rootdir = (DirectoryType) root.getUserObject();
! Vector result = searcher.search( rootdir.getFiles());
frame.setResultListData( result);
}
--- 188,192 ----
if ( searcher.getQueryCount() == 0) return;
! Vector result = searcher.search( roots.getFiles());
frame.setResultListData( result);
}
|
|
From: <sim...@us...> - 2002-07-26 07:54:38
|
Update of /cvsroot/cdchamber/CDChamber/data In directory usw-pr-cvs1:/tmp/cvs-serv11852/data Modified Files: repository.xml Log Message: Refactor the controller, add one roots in it. Index: repository.xml =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/data/repository.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** repository.xml 18 Jul 2002 00:32:22 -0000 1.1 --- repository.xml 26 Jul 2002 07:54:33 -0000 1.2 *************** *** 1,2 **** <?xml version="1.0" encoding="UTF-8"?> ! <directory-type files-count="2" date="1025685715000" size="2" valid="true"><name>foo</name><files files-count="1" date="1025685715000" size="1" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>bar</name><files date="1025685715000" size="1" valid="true"><name>world</name></files><content></content></files><files date="1025685715000" size="1" valid="true"><name>hello</name></files><content></content></directory-type> \ No newline at end of file --- 1,2 ---- <?xml version="1.0" encoding="UTF-8"?> ! <CDRomType valid="true" date="1025685715000" files-count="2" size="2"><files files-count="1" date="1025685715000" size="1" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>bar</name><files date="1025685715000" size="1" valid="true"><name>world</name><desc>sssssssssssssss</desc></files><content></content></files><files date="1025685715000" size="1" valid="true"><name>hello</name></files><name>foo</name><content></content><data-file-name>D:\work\CDChamber\data\repository.xml</data-file-name></CDRomType> \ No newline at end of file |
|
From: <sim...@us...> - 2002-07-26 07:54:37
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv11852/src/org/cdchamber/elements
Modified Files:
CDRomType.java
Log Message:
Refactor the controller, add one roots in it.
Index: CDRomType.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/elements/CDRomType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CDRomType.java 22 Jul 2002 06:45:19 -0000 1.2
--- CDRomType.java 26 Jul 2002 07:54:33 -0000 1.3
***************
*** 33,36 ****
--- 33,41 ----
}
+ public CDRomType( DirectoryType dir, String dataFileName) {
+ this( dir);
+ this.setDataFileName( dataFileName);
+ }
+
public void marshal() throws MarshalException, ValidationException, IOException {
Writer out = new FileWriter(this.getDataFileName());
|
|
From: <cry...@us...> - 2002-07-26 07:16:51
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv3216
Modified Files:
SearcherTest.java
Log Message:
remove RemoveQuery method
Index: SearcherTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher/SearcherTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SearcherTest.java 26 Jul 2002 05:20:44 -0000 1.4
--- SearcherTest.java 26 Jul 2002 07:16:48 -0000 1.5
***************
*** 71,89 ****
}
- public void testRemoveQuery() {
- SizeQuery query = new SizeQuery( 0, 0);
- searcher.addQuery( query);
- searcher.addQuery( new SizeQuery( 0, 0));
- searcher.removeQuery( query);
- assertEquals( "Size should be 1 after remove 1", 1, searcher.queries.size());
- }
-
- public void testRemoveAllQuery() {
- searcher.addQuery( new SizeQuery( 0, 0));
- searcher.addQuery( new SizeQuery( 0, 0));
- searcher.removeAllQuery();
- assertEquals( "Size should be 0 after remove all", 0, searcher.queries.size());
- }
-
public void testSearchAll() {
searcher.addQuery( new StandardQuery( "abc"));
--- 71,74 ----
|
|
From: <cry...@us...> - 2002-07-26 07:16:38
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher In directory usw-pr-cvs1:/tmp/cvs-serv3164 Removed Files: ISearcher.java Log Message: Remove ISearcher Interface --- ISearcher.java DELETED --- |
|
From: <cry...@us...> - 2002-07-26 07:16:21
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv3120
Modified Files:
Searcher.java
Log Message:
remove ISearcher Interface and remove RemoveQuery method
Index: Searcher.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher/Searcher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Searcher.java 26 Jul 2002 05:20:44 -0000 1.4
--- Searcher.java 26 Jul 2002 07:16:17 -0000 1.5
***************
*** 10,14 ****
import java.util.Vector;
! public class Searcher implements ISearcher {
Vector queries = new Vector();
--- 10,14 ----
import java.util.Vector;
! public class Searcher {
Vector queries = new Vector();
***************
*** 17,32 ****
}
-
-
public void addQuery(IQueryCondition query) {
queries.add( query);
- }
-
- public void removeAllQuery() {
- queries.removeAllElements();
- }
-
- public void removeQuery(IQueryCondition query) {
- queries.remove( query);
}
--- 17,22 ----
|
|
From: <sim...@us...> - 2002-07-26 06:57:04
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv31189/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameControllerTest.java
Log Message:
Add result list.
Need to add list actions.
Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CDCMainFrameControllerTest.java 22 Jul 2002 06:45:19 -0000 1.12
--- CDCMainFrameControllerTest.java 26 Jul 2002 06:56:58 -0000 1.13
***************
*** 13,19 ****
--- 13,22 ----
import org.cdchamber.util.DirPath;
import org.cdchamber.elements.CDRomType;
+ import org.cdchamber.searcher.Searcher;
+ import org.cdchamber.searcher.StandardQuery;
import java.io.File;
import java.io.FilenameFilter;
+ import java.util.Vector;
public class CDCMainFrameControllerTest extends TestCase {
***************
*** 153,156 ****
--- 156,170 ----
}
+ public void testSearchAction() throws Exception {
+ JTree jTree = new JTree();
+ jTree.setModel( frame.treeModel);
+ jTree.addTreeSelectionListener( controller);
+ jTree.setSelectionRow( 0);
+
+ Action action = controller.getSearchCDRomAction();
+ action.actionPerformed( null);
+ assertNotNull( "Data should not be null", frame.result);
+ }
+
private boolean hasNewerData() {
File dataDir = new File( DirPath.DataDir);
***************
*** 198,200 ****
--- 212,226 ----
this.exception = exception;
}
+
+ Vector result = null;
+ public void setResultListData(Vector data) {
+ result = data;
+ }
+
+ public Searcher getSearcher() {
+ Searcher searcher = new Searcher();
+ searcher.addQuery( new StandardQuery( "test"));
+ return searcher;
+ }
+
}
|
|
From: <sim...@us...> - 2002-07-26 06:57:03
|
Update of /cvsroot/cdchamber/CDChamber In directory usw-pr-cvs1:/tmp/cvs-serv31189 Modified Files: TODO.txt Log Message: Add result list. Need to add list actions. Index: TODO.txt =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/TODO.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TODO.txt 18 Jul 2002 03:11:37 -0000 1.10 --- TODO.txt 26 Jul 2002 06:56:57 -0000 1.11 *************** *** 6,13 **** x : Auto update the castor.jar's castorbuilder.properties. x : Find a way to test empty directory, file date and different directory size on different os. ! + : write DirectoryType testcases ! + : write FileType testcases ! + : Code Standard should be wrote. + : Add filter to ignore files/dirs like CVS, *.bak, *~, etc. - + : Add GUI Testcases + : GUI codes need refactored. --- 6,12 ---- x : Auto update the castor.jar's castorbuilder.properties. x : Find a way to test empty directory, file date and different directory size on different os. ! x : write DirectoryType testcases ! x : write FileType testcases ! x : Add GUI Testcases + : Add filter to ignore files/dirs like CVS, *.bak, *~, etc. + : GUI codes need refactored. |
|
From: <sim...@us...> - 2002-07-26 06:57:03
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv31189/src/org/cdchamber/gui
Modified Files:
CDCMainFrame.java CDCMainFrameController.java
ICDCMainFrame.java
Log Message:
Add result list.
Need to add list actions.
Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CDCMainFrame.java 24 Jul 2002 08:04:57 -0000 1.18
--- CDCMainFrame.java 26 Jul 2002 06:56:57 -0000 1.19
***************
*** 7,10 ****
--- 7,12 ----
package org.cdchamber.gui;
+ import org.cdchamber.searcher.Searcher;
+
import javax.swing.*;
import javax.swing.table.TableModel;
***************
*** 13,16 ****
--- 15,19 ----
import java.awt.event.*;
import java.awt.*;
+ import java.util.Vector;
public class CDCMainFrame extends JFrame implements ICDCMainFrame {
***************
*** 30,33 ****
--- 33,38 ----
JTree directoryTree = new FileTree();
JTable filesTable = new JTable();
+ JList resultList = new JList();
+ JSplitPane realMainPane = new JSplitPane( JSplitPane.VERTICAL_SPLIT);
CDCMainFrameController controller;
***************
*** 86,90 ****
contentPane.setLayout(borderLayout1);
! contentPane.add( BorderLayout.CENTER, mainPane);
mainPane.setBorder( new EtchedBorder());
--- 91,102 ----
contentPane.setLayout(borderLayout1);
! contentPane.add( BorderLayout.CENTER, realMainPane);
!
! realMainPane.add( JSplitPane.TOP, mainPane);
! realMainPane.add( JSplitPane.BOTTOM, new JScrollPane( resultList));
!
! realMainPane.setOneTouchExpandable( true);
! realMainPane.setResizeWeight( 1.0);
!
mainPane.setBorder( new EtchedBorder());
***************
*** 140,143 ****
--- 152,169 ----
cdromExit_actionPerformed();
}
+ }
+
+ public void setResultListData( Vector data) {
+ resultList.setListData( data);
+ resultList.validate();
+ realMainPane.setDividerLocation( 0.8);
+ }
+
+ SearchDialog searchDialog = new SearchDialog();
+
+ public Searcher getSearcher() {
+ searchDialog.setSize(500, 300);
+ CDChamber.showWinowAtCenter( searchDialog);
+ return searchDialog.searcher;
}
Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CDCMainFrameController.java 26 Jul 2002 05:02:05 -0000 1.12
--- CDCMainFrameController.java 26 Jul 2002 06:56:57 -0000 1.13
***************
*** 10,13 ****
--- 10,14 ----
import org.cdchamber.elements.CDRomType;
import org.cdchamber.util.DirPath;
+ import org.cdchamber.searcher.Searcher;
import org.exolab.castor.xml.MarshalException;
import org.exolab.castor.xml.ValidationException;
***************
*** 167,171 ****
}
- SearchDialog searchDialog = new SearchDialog();
public class SearchCDRomAction extends AbstractAction {
public SearchCDRomAction() {
--- 168,171 ----
***************
*** 175,186 ****
public void actionPerformed(ActionEvent e) {
! searchDialog.setSize(500, 300);
! CDChamber.showWinowAtCenter( searchDialog);
! if ( searchDialog.searcher.getQueryCount() == 0) return;
! // do the real search
DefaultMutableTreeNode root = (DefaultMutableTreeNode)selectedNode.getRoot();
DirectoryType rootdir = (DirectoryType) root.getUserObject();
! Vector result = searchDialog.searcher.search( rootdir.getFiles());
! System.out.println( result.size());
}
}
--- 175,186 ----
public void actionPerformed(ActionEvent e) {
! Searcher searcher = frame.getSearcher();
! if ( searcher.getQueryCount() == 0) return;
!
! // TODO: Need refactoring.
DefaultMutableTreeNode root = (DefaultMutableTreeNode)selectedNode.getRoot();
DirectoryType rootdir = (DirectoryType) root.getUserObject();
! Vector result = searcher.search( rootdir.getFiles());
! frame.setResultListData( result);
}
}
Index: ICDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/ICDCMainFrame.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ICDCMainFrame.java 19 Jul 2002 05:25:20 -0000 1.3
--- ICDCMainFrame.java 26 Jul 2002 06:56:57 -0000 1.4
***************
*** 5,10 ****
--- 5,13 ----
package org.cdchamber.gui;
+ import org.cdchamber.searcher.Searcher;
+
import javax.swing.table.TableModel;
import javax.swing.tree.TreeModel;
+ import java.util.Vector;
public interface ICDCMainFrame {
***************
*** 41,43 ****
--- 44,58 ----
*/
public void dealWithActionException( String message, Exception exception);
+
+ /**
+ * Set the search result list
+ * @param data the new search result list model.
+ */
+ public void setResultListData( Vector data);
+
+ /**
+ * Get the searcher
+ * @return get user define searcher.
+ */
+ public Searcher getSearcher();
}
|
|
From: <cry...@us...> - 2002-07-26 05:34:04
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv14774
Modified Files:
SizeQueryTest.java
Log Message:
add several SizeQuery testcases
Index: SizeQueryTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher/SizeQueryTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SizeQueryTest.java 25 Jul 2002 08:23:11 -0000 1.1
--- SizeQueryTest.java 26 Jul 2002 05:34:01 -0000 1.2
***************
*** 26,41 ****
public void testAtLeast() {
SizeQuery query = new SizeQuery( 400, -1);
! assertTrue( "Should not pass atLeast", !query.isMatched( fileType));
}
public void testAtMost() {
SizeQuery query = new SizeQuery( -1, 200);
! assertTrue( "Should not pass atMost", !query.isMatched( fileType));
}
public void testBetween() {
SizeQuery query = new SizeQuery( 200, 300);
! assertTrue( "Should pass", query.isMatched( fileType));
}
}
--- 26,57 ----
public void testAtLeast() {
SizeQuery query = new SizeQuery( 400, -1);
! assertTrue( "Should not matched", !query.isMatched( fileType));
}
public void testAtMost() {
SizeQuery query = new SizeQuery( -1, 200);
! assertTrue( "Should not matched", !query.isMatched( fileType));
}
public void testBetween() {
SizeQuery query = new SizeQuery( 200, 300);
! assertTrue( "Should matched", query.isMatched( fileType));
}
+
+ public void testLess() {
+ SizeQuery query = new SizeQuery( 100,299);
+ assertTrue( "Should not matched", !query.isMatched( fileType));
+ }
+
+ public void testMore() {
+ SizeQuery query = new SizeQuery( 301,400);
+ assertTrue( "Should not matched", !query.isMatched( fileType));
+ }
+
+ public void testBound() {
+ SizeQuery query = new SizeQuery( 300,300);
+ assertTrue( "Should matched", query.isMatched( fileType));
+ }
+
}
|
|
From: <sim...@us...> - 2002-07-26 05:20:47
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv11158/test/src/org/cdchamber/searcher
Modified Files:
SearcherTest.java
Log Message:
Bug fix for can't search subdir.
Index: SearcherTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher/SearcherTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SearcherTest.java 26 Jul 2002 05:02:06 -0000 1.3
--- SearcherTest.java 26 Jul 2002 05:20:44 -0000 1.4
***************
*** 32,38 ****
root.addFiles( file);
// to search scope
! file = new DirectoryType();
! file.setName( "2abc");
! root.addFiles( file);
// to search size
file = new FileType();
--- 32,48 ----
root.addFiles( file);
// to search scope
! DirectoryType dir = new DirectoryType();
! dir.setName( "2abc");
!
! // match all
! calendar.set( 2002, 1, 15);
! file = new FileType();
! file.setDate( calendar.getTime().getTime());
! file.setName( "6abc");
! file.setSize( 310);
! dir.addFiles( file);
!
!
! root.addFiles( dir);
// to search size
file = new FileType();
***************
*** 51,62 ****
root.addFiles( file);
- // match all
- calendar.set( 2002, 1, 15);
- file = new FileType();
- file.setDate( calendar.getTime().getTime());
- file.setName( "6abc");
- file.setSize( 310);
- root.addFiles( file);
-
}
--- 61,64 ----
***************
*** 87,91 ****
searcher.addQuery( new StandardQuery( "abc"));
Vector result = searcher.search( root.getFiles());
! assertEquals( "Should match all results", root.getFilesCount(), result.size());
}
--- 89,93 ----
searcher.addQuery( new StandardQuery( "abc"));
Vector result = searcher.search( root.getFiles());
! assertEquals( "Should match all results", root.getFilesCount()+1, result.size());
}
|
|
From: <sim...@us...> - 2002-07-26 05:20:47
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv11158/src/org/cdchamber/searcher
Modified Files:
Searcher.java
Log Message:
Bug fix for can't search subdir.
Index: Searcher.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher/Searcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Searcher.java 26 Jul 2002 05:02:05 -0000 1.3
--- Searcher.java 26 Jul 2002 05:20:44 -0000 1.4
***************
*** 6,9 ****
--- 6,10 ----
import org.cdchamber.elements.FileType;
+ import org.cdchamber.elements.DirectoryType;
import java.util.Vector;
***************
*** 40,44 ****
--- 41,50 ----
}
if ( matched) result.add( fileTypes[i]);
+ if ( fileTypes[i] instanceof DirectoryType) {
+ DirectoryType dir = (DirectoryType) fileTypes[i];
+ result.addAll( search( dir.getFiles()));
+ }
}
+
return result;
}
|
|
From: <sim...@us...> - 2002-07-26 05:02:12
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv7710/test/src/org/cdchamber/searcher
Modified Files:
DateQueryTest.java SearcherTest.java
Log Message:
Add search action to main frame.
need more function yet.
Index: DateQueryTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher/DateQueryTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DateQueryTest.java 25 Jul 2002 08:13:01 -0000 1.1
--- DateQueryTest.java 26 Jul 2002 05:02:06 -0000 1.2
***************
*** 33,37 ****
beginTime.set( 2002, 6, 23);
endTime.set( 2002, 7, 23);
! DateQuery query = new DateQuery( beginTime.getTime(), endTime.getTime());
assertTrue( "Should not matched1", !query.isMatched( fileType));
}
--- 33,37 ----
beginTime.set( 2002, 6, 23);
endTime.set( 2002, 7, 23);
! DateQuery query = new DateQuery( beginTime, endTime);
assertTrue( "Should not matched1", !query.isMatched( fileType));
}
***************
*** 40,44 ****
beginTime.set( 2002, 7, 26);
endTime.set( 2002, 8, 23);
! DateQuery query = new DateQuery( endTime.getTime(), beginTime.getTime());
assertTrue( "Should not matched2", !query.isMatched( fileType));
}
--- 40,44 ----
beginTime.set( 2002, 7, 26);
endTime.set( 2002, 8, 23);
! DateQuery query = new DateQuery( endTime, beginTime);
assertTrue( "Should not matched2", !query.isMatched( fileType));
}
***************
*** 47,54 ****
beginTime.set( 2002, 7, 23);
endTime.set( 2002, 8, 23);
! DateQuery query = new DateQuery( endTime.getTime(), beginTime.getTime());
assertTrue( "Should match1", query.isMatched( fileType));
! query = new DateQuery( beginTime.getTime(), endTime.getTime());
assertTrue( "Should match2", query.isMatched( fileType));
}
--- 47,54 ----
beginTime.set( 2002, 7, 23);
endTime.set( 2002, 8, 23);
! DateQuery query = new DateQuery( endTime, beginTime);
assertTrue( "Should match1", query.isMatched( fileType));
! query = new DateQuery( beginTime, endTime);
assertTrue( "Should match2", query.isMatched( fileType));
}
Index: SearcherTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher/SearcherTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SearcherTest.java 26 Jul 2002 01:18:08 -0000 1.2
--- SearcherTest.java 26 Jul 2002 05:02:06 -0000 1.3
***************
*** 95,99 ****
Calendar end = Calendar.getInstance();
end.set( 2002, 2, 1);
! searcher.addQuery( new DateQuery( end.getTime(), begin.getTime()));
searcher.addQuery( new ScopeQuery( FileType.class) );
--- 95,99 ----
Calendar end = Calendar.getInstance();
end.set( 2002, 2, 1);
! searcher.addQuery( new DateQuery( end, begin));
searcher.addQuery( new ScopeQuery( FileType.class) );
|
|
From: <sim...@us...> - 2002-07-26 05:02:12
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv7710/test/src/org/cdchamber/gui
Modified Files:
CDCMainFrameTest.java
Log Message:
Add search action to main frame.
need more function yet.
Index: CDCMainFrameTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CDCMainFrameTest.java 21 Jul 2002 13:23:59 -0000 1.10
--- CDCMainFrameTest.java 26 Jul 2002 05:02:06 -0000 1.11
***************
*** 81,85 ****
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));
}
--- 81,85 ----
public void testTableColumnsUnchangable() {
assertTrue( "Can't change value at name column", !frame.filesTable.getModel().isCellEditable( 0, FilesTableModel.NAME));
! assertTrue( "Can't change value at sizeField column", !frame.filesTable.getModel().isCellEditable( 0, FilesTableModel.SIZE));
assertTrue( "Can't change value at date column", !frame.filesTable.getModel().isCellEditable( 0, FilesTableModel.DATE));
}
|
|
From: <sim...@us...> - 2002-07-26 05:02:12
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui In directory usw-pr-cvs1:/tmp/cvs-serv7710/src/org/cdchamber/gui Modified Files: CDCMainFrameController.java SearchDialog.java Log Message: Add search action to main frame. need more function yet. Index: CDCMainFrameController.java =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CDCMainFrameController.java 24 Jul 2002 08:04:57 -0000 1.11 --- CDCMainFrameController.java 26 Jul 2002 05:02:05 -0000 1.12 *************** *** 19,22 **** --- 19,23 ---- import java.io.*; import java.awt.event.ActionEvent; + import java.util.Vector; public class CDCMainFrameController implements TreeSelectionListener { *************** *** 176,179 **** --- 177,186 ---- searchDialog.setSize(500, 300); CDChamber.showWinowAtCenter( searchDialog); + if ( searchDialog.searcher.getQueryCount() == 0) return; + // do the real search + DefaultMutableTreeNode root = (DefaultMutableTreeNode)selectedNode.getRoot(); + DirectoryType rootdir = (DirectoryType) root.getUserObject(); + Vector result = searchDialog.searcher.search( rootdir.getFiles()); + System.out.println( result.size()); } } Index: SearchDialog.java =================================================================== RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/SearchDialog.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SearchDialog.java 25 Jul 2002 09:48:44 -0000 1.4 --- SearchDialog.java 26 Jul 2002 05:02:05 -0000 1.5 *************** *** 5,8 **** --- 5,11 ---- package org.cdchamber.gui; + import org.cdchamber.searcher.*; + import org.cdchamber.elements.*; + import javax.swing.*; import java.awt.*; *************** *** 38,47 **** JPanel jPanelSize = new JPanel(); JCheckBox jCheckSize = new JCheckBox(); ! private JCheckBox jCheckBox5 = new JCheckBox(); ! private JLabel jLabel8 = new JLabel(); ! private JTextField jTextLessThanSize = new JTextField(); ! private JCheckBox jCheckBox4 = new JCheckBox(); ! private JLabel jLabel7 = new JLabel(); ! private JTextField jTextMoreThanSize = new JTextField(); JPanel jPanelAdvance = new JPanel(); --- 41,46 ---- JPanel jPanelSize = new JPanel(); JCheckBox jCheckSize = new JCheckBox(); ! private SizeBox lessThan = new SizeBox( "Less Than"); ! private SizeBox moreThan = new SizeBox( "More Than"); JPanel jPanelAdvance = new JPanel(); *************** *** 77,80 **** --- 76,84 ---- initAdvancePanel(); + jPanelAdvance.setVisible(false); + jPanelDate.setVisible(false); + jPanelScope.setVisible(false); + jPanelSize.setVisible(false); + initConditionsPanel(); *************** *** 88,95 **** this.getContentPane().add(jPanelButtons, BorderLayout.SOUTH); ! jPanelAdvance.setVisible(false); ! jPanelDate.setVisible(false); ! jPanelScope.setVisible(false); ! jPanelSize.setVisible(false); jCheckAdvance.addItemListener(new ItemListener() { --- 92,97 ---- this.getContentPane().add(jPanelButtons, BorderLayout.SOUTH); ! ! jCheckAdvance.addItemListener(new ItemListener() { *************** *** 126,131 **** --- 128,201 ---- }); + jButtonSearch.addActionListener( new ActionListener() { + public void actionPerformed(ActionEvent e) { + searchButtonPerform(); + } + }); + + jButtonCancel.addActionListener( new ActionListener() { + public void actionPerformed(ActionEvent e) { + cancelButtonPerform(); + } + }); + } + + private void cancelButtonPerform() { + searcher.removeAllQuery(); + this.hide(); + } + + private void searchButtonPerform() { + searcher.removeAllQuery(); + if ( jCheckDate.isSelected()) searcher.addQuery( new DateQuery( jDateBegin.getDate(), jDateEnd.getDate())); + if ( jCheckSize.isSelected()) { + searcher.addQuery( new SizeQuery( moreThan.getTheSize(), lessThan.getTheSize())); + } + if ( jCheckScope.isSelected()) { + searcher.addQuery( new ScopeQuery( (Class)scopes[1][ jComboScope.getSelectedIndex()])); + } + if ( jCheckAdvance.isSelected()) { + searcher.addQuery( new AdvanceQuery( jCheckNoDesc.isSelected(), jCheckCaseSensitive.isSelected(), jTextSearchWorld.getText())); + } else { + searcher.addQuery( new StandardQuery( jTextSearchWorld.getText())); + } + this.hide(); + } + + class SizeBox extends JPanel { + + JCheckBox checkBox = new JCheckBox(); + JTextField sizeField = new JTextField( 7); + JLabel label = new JLabel( "KB"); + public SizeBox( String checkText) { + super(); + FlowLayout layout = new FlowLayout(); + initFlowLayout( layout); + setLayout( layout); + + checkBox.setText( checkText); + + this.add( checkBox, null); + this.add( sizeField, null); + this.add( label, null); + + sizeField.setHorizontalAlignment( JTextField.RIGHT); + DigitInputVerifier inputVerifier = new DigitInputVerifier(); + sizeField.setInputVerifier(inputVerifier); + + } + + public long getTheSize() { + if ( !checkBox.isSelected()) return -1; + try { + return Long.parseLong( sizeField.getText().trim()); + } catch (NumberFormatException e) { + return -1; + } + } } + Searcher searcher = new Searcher(); + private void initButtonsPanel() { jButtonSearch.setText("Search"); *************** *** 165,170 **** jPanelScope.setLayout(flowLayout1); jPanelScope.add(jComboScope, null); - } private void initWordsPanel() { jLabel1.setText("Words:"); --- 235,253 ---- jPanelScope.setLayout(flowLayout1); jPanelScope.add(jComboScope, null); + jComboScope.setModel( new DefaultComboBoxModel( scopes[0])); + } + Object [][] scopes = new Object[][]{ + new String[] { + "Files Only", + "Directory Only", + "CDRom Only" + }, + new Class[] { + FileType.class, + DirectoryType.class, + CDRomType.class + } + }; private void initWordsPanel() { jLabel1.setText("Words:"); *************** *** 195,222 **** jCheckSize.setText("Size:"); - jCheckBox5.setText("MoreThan"); - jLabel8.setText("KB"); - jCheckBox4.setText("LessThan"); - jLabel7.setText("KB"); - - jTextLessThanSize.setColumns(7); - jTextMoreThanSize.setColumns(7); - jTextLessThanSize.setHorizontalAlignment(JTextField.RIGHT); - jTextMoreThanSize.setHorizontalAlignment(JTextField.RIGHT); - - DigitInputVerifier inputVerifier = new DigitInputVerifier(); - jTextLessThanSize.setInputVerifier(inputVerifier); - jTextMoreThanSize.setInputVerifier(inputVerifier); - - initFlowLayout(flowLayout3); jPanelSize.setLayout(flowLayout3); ! jPanelSize.add(jCheckBox4, null); ! jPanelSize.add(jTextLessThanSize, null); ! jPanelSize.add(jLabel8, null); ! jPanelSize.add(jCheckBox5, null); ! jPanelSize.add(jTextMoreThanSize, null); ! jPanelSize.add(jLabel7, null); } --- 278,286 ---- jCheckSize.setText("Size:"); initFlowLayout(flowLayout3); jPanelSize.setLayout(flowLayout3); ! jPanelSize.add( lessThan, null); ! jPanelSize.add( moreThan, null); } |
|
From: <sim...@us...> - 2002-07-26 05:02:12
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv7710/src/org/cdchamber/searcher
Modified Files:
DateQuery.java ISearcher.java Searcher.java
Log Message:
Add search action to main frame.
need more function yet.
Index: DateQuery.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher/DateQuery.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DateQuery.java 25 Jul 2002 08:13:01 -0000 1.1
--- DateQuery.java 26 Jul 2002 05:02:05 -0000 1.2
***************
*** 8,16 ****
import java.util.Date;
public class DateQuery implements IQueryCondition {
! private Date beginDate;
! private Date endDate;
! public DateQuery( Date beginDate, Date endDate) {
this.beginDate = beginDate;
this.endDate = endDate;
--- 8,17 ----
import java.util.Date;
+ import java.util.Calendar;
public class DateQuery implements IQueryCondition {
! private Calendar beginDate;
! private Calendar endDate;
! public DateQuery( Calendar beginDate, Calendar endDate) {
this.beginDate = beginDate;
this.endDate = endDate;
***************
*** 19,24 ****
public boolean isMatched(FileType filetype) {
long fileTime = filetype.getDate();
! if ( (fileTime<=endDate.getTime()) && (fileTime>=beginDate.getTime())) return true;
! if ( (fileTime>=endDate.getTime()) && (fileTime<=beginDate.getTime())) return true;
return false;
}
--- 20,27 ----
public boolean isMatched(FileType filetype) {
long fileTime = filetype.getDate();
! if ( (fileTime<=endDate.getTime().getTime())
! && (fileTime>=beginDate.getTime().getTime())) return true;
! if ( (fileTime>=endDate.getTime().getTime())
! && (fileTime<=beginDate.getTime().getTime())) return true;
return false;
}
Index: ISearcher.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher/ISearcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ISearcher.java 25 Jul 2002 10:43:19 -0000 1.1
--- ISearcher.java 26 Jul 2002 05:02:05 -0000 1.2
***************
*** 14,16 ****
--- 14,17 ----
public void removeQuery( IQueryCondition query);
public void removeAllQuery();
+ public int getQueryCount();
}
Index: Searcher.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher/Searcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Searcher.java 26 Jul 2002 01:18:08 -0000 1.2
--- Searcher.java 26 Jul 2002 05:02:05 -0000 1.3
***************
*** 12,15 ****
--- 12,21 ----
Vector queries = new Vector();
+ public int getQueryCount() {
+ return queries.size();
+ }
+
+
+
public void addQuery(IQueryCondition query) {
queries.add( query);
|
|
From: <sim...@us...> - 2002-07-26 01:18:11
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv29809/test/src/org/cdchamber/searcher
Modified Files:
SearcherTest.java
Log Message:
Implement the searcher and its testcase.
Index: SearcherTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher/SearcherTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SearcherTest.java 25 Jul 2002 10:43:20 -0000 1.1
--- SearcherTest.java 26 Jul 2002 01:18:08 -0000 1.2
***************
*** 9,17 ****
import org.cdchamber.elements.FileType;
public class SearcherTest extends TestCase {
protected void setUp() throws Exception {
super.setUp();
!
! FileType file = new FileType();
}
--- 9,19 ----
import org.cdchamber.elements.FileType;
+ import java.util.Calendar;
+ import java.util.Vector;
+
public class SearcherTest extends TestCase {
protected void setUp() throws Exception {
super.setUp();
! searcher = new Searcher();
}
***************
*** 22,31 ****
public SearcherTest(String s) {
super(s);
}
DirectoryType root = new DirectoryType();
! public void testQueryAdd() {
}
}
--- 24,109 ----
public SearcherTest(String s) {
super(s);
+ FileType file = new FileType();
+ // to search date
+ Calendar calendar = Calendar.getInstance();
+ calendar.set( 2002, 2, 2);
+ file.setName( "1abc");
+ file.setDate( calendar.getTime().getTime());
+ root.addFiles( file);
+ // to search scope
+ file = new DirectoryType();
+ file.setName( "2abc");
+ root.addFiles( file);
+ // to search size
+ file = new FileType();
+ file.setName( "3abc");
+ file.setSize( 200);
+ root.addFiles( file);
+ // to search advance, file name only
+ file = new FileType();
+ file.setName( "4ab");
+ file.setDesc( "abc");
+ root.addFiles( file);
+
+ // to search advance, case sensitive
+ file = new FileType();
+ file.setName( "5Abc");
+ root.addFiles( file);
+
+ // match all
+ calendar.set( 2002, 1, 15);
+ file = new FileType();
+ file.setDate( calendar.getTime().getTime());
+ file.setName( "6abc");
+ file.setSize( 310);
+ root.addFiles( file);
+
}
DirectoryType root = new DirectoryType();
+ Searcher searcher;
! public void testAddQuery() {
! searcher.addQuery( new SizeQuery( 0, 0));
! assertEquals( "Size should be 1", 1, searcher.queries.size());
! }
!
! public void testRemoveQuery() {
! SizeQuery query = new SizeQuery( 0, 0);
! searcher.addQuery( query);
! searcher.addQuery( new SizeQuery( 0, 0));
! searcher.removeQuery( query);
! assertEquals( "Size should be 1 after remove 1", 1, searcher.queries.size());
! }
!
! public void testRemoveAllQuery() {
! searcher.addQuery( new SizeQuery( 0, 0));
! searcher.addQuery( new SizeQuery( 0, 0));
! searcher.removeAllQuery();
! assertEquals( "Size should be 0 after remove all", 0, searcher.queries.size());
! }
!
! public void testSearchAll() {
! searcher.addQuery( new StandardQuery( "abc"));
! Vector result = searcher.search( root.getFiles());
! assertEquals( "Should match all results", root.getFilesCount(), result.size());
! }
+ public void testAllCondition() {
+ Calendar begin = Calendar.getInstance();
+ begin.set( 2002, 1, 1);
+ Calendar end = Calendar.getInstance();
+ end.set( 2002, 2, 1);
+ searcher.addQuery( new DateQuery( end.getTime(), begin.getTime()));
+
+ searcher.addQuery( new ScopeQuery( FileType.class) );
+
+ searcher.addQuery( new SizeQuery( 300, -1) );
+
+ searcher.addQuery( new AdvanceQuery( true, true, "abc"));
+
+ Vector result = searcher.search( root.getFiles());
+
+ assertEquals( "Should only return 1", 1, result.size());
}
}
|
|
From: <sim...@us...> - 2002-07-26 01:18:11
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv29809/src/org/cdchamber/searcher
Modified Files:
Searcher.java
Log Message:
Implement the searcher and its testcase.
Index: Searcher.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher/Searcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Searcher.java 25 Jul 2002 10:43:19 -0000 1.1
--- Searcher.java 26 Jul 2002 01:18:08 -0000 1.2
***************
*** 25,29 ****
public Vector search(FileType[] fileTypes) {
! return null;
}
--- 25,39 ----
public Vector search(FileType[] fileTypes) {
! Vector result = new Vector();
! if ( queries.size() == 0) return result;
! for ( int i=0; i<fileTypes.length; i++) {
! boolean matched = true;
! for ( int j=0; matched && j<queries.size(); j++) {
! IQueryCondition query = (IQueryCondition) queries.elementAt(j);
! if ( !query.isMatched( fileTypes[i])) matched=false;
! }
! if ( matched) result.add( fileTypes[i]);
! }
! return result;
}
|
|
From: <sim...@us...> - 2002-07-25 10:43:23
|
Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv20364/src/org/cdchamber/searcher
Added Files:
ISearcher.java Searcher.java
Log Message:
Add the searcher. but not implement it yet.
--- NEW FILE: ISearcher.java ---
/*
* User: Simon
* $Id: ISearcher.java,v 1.1 2002/07/25 10:43:19 simon_lei Exp $
*/
package org.cdchamber.searcher;
import org.cdchamber.elements.FileType;
import java.util.Vector;
public interface ISearcher {
public Vector search( FileType[] fileTypes);
public void addQuery( IQueryCondition query);
public void removeQuery( IQueryCondition query);
public void removeAllQuery();
}
--- NEW FILE: Searcher.java ---
/*
* User: Simon
* $Id: Searcher.java,v 1.1 2002/07/25 10:43:19 simon_lei Exp $
*/
package org.cdchamber.searcher;
import org.cdchamber.elements.FileType;
import java.util.Vector;
public class Searcher implements ISearcher {
Vector queries = new Vector();
public void addQuery(IQueryCondition query) {
queries.add( query);
}
public void removeAllQuery() {
queries.removeAllElements();
}
public void removeQuery(IQueryCondition query) {
queries.remove( query);
}
public Vector search(FileType[] fileTypes) {
return null;
}
}
|
|
From: <sim...@us...> - 2002-07-25 10:43:23
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv20364/test/src/org/cdchamber/searcher
Added Files:
SearcherTest.java
Log Message:
Add the searcher. but not implement it yet.
--- NEW FILE: SearcherTest.java ---
/*
* User: Simon
* $Id: SearcherTest.java,v 1.1 2002/07/25 10:43:20 simon_lei Exp $
*/
package org.cdchamber.searcher;
import junit.framework.TestCase;
import org.cdchamber.elements.DirectoryType;
import org.cdchamber.elements.FileType;
public class SearcherTest extends TestCase {
protected void setUp() throws Exception {
super.setUp();
FileType file = new FileType();
}
protected void tearDown() throws Exception {
super.tearDown();
}
public SearcherTest(String s) {
super(s);
}
DirectoryType root = new DirectoryType();
public void testQueryAdd() {
}
}
|
|
From: <sim...@us...> - 2002-07-25 09:48:47
|
Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher
In directory usw-pr-cvs1:/tmp/cvs-serv7511/test/src/org/cdchamber/searcher
Modified Files:
StandardQueryTest.java
Added Files:
AdvanceQueryTest.java
Log Message:
Add advance query.
--- NEW FILE: AdvanceQueryTest.java ---
/*
* User: Simon
* $Id: AdvanceQueryTest.java,v 1.1 2002/07/25 09:48:44 simon_lei Exp $
*/
package org.cdchamber.searcher;
import junit.framework.TestCase;
import org.cdchamber.elements.FileType;
public class AdvanceQueryTest extends TestCase {
protected void setUp() throws Exception {
super.setUp();
fileType = new FileType();
fileType.setName( "nameisAbcdef");
fileType.setDesc( "onlydefand ghi");
}
protected void tearDown() throws Exception {
super.tearDown();
}
public AdvanceQueryTest(String s) {
super(s);
}
FileType fileType;
public void testNoDesc() {
AdvanceQuery query = new AdvanceQuery( false, false, "ghi");
assertTrue( "Include desc, should match", query.isMatched( fileType));
query = new AdvanceQuery( true, false, "ghi");
assertTrue( "Nodesc, should not match", !query.isMatched( fileType));
}
public void testCaseSense() {
AdvanceQuery query = new AdvanceQuery( false, false, "abc");
assertTrue( "Not case sense, should match", query.isMatched( fileType));
query = new AdvanceQuery( false , true, "abc");
assertTrue( "Case sense, should not match", !query.isMatched( fileType));
}
}
Index: StandardQueryTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/searcher/StandardQueryTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StandardQueryTest.java 25 Jul 2002 09:11:08 -0000 1.1
--- StandardQueryTest.java 25 Jul 2002 09:48:44 -0000 1.2
***************
*** 23,35 ****
private FileType fileType;
! StandardQuery query = new StandardQuery( "abc");
public void testNameContains() {
! fileType.setName( "nameisabcdefg");
assertTrue( "Name contains abc", query.isMatched( fileType));
}
public void testDescContains() {
! fileType.setDesc( "nameisabcdefg");
assertTrue( "Desc contains abc", query.isMatched( fileType));
}
--- 23,35 ----
private FileType fileType;
! StandardQuery query = new StandardQuery( "Abc");
public void testNameContains() {
! fileType.setName( "nameisabCdefg");
assertTrue( "Name contains abc", query.isMatched( fileType));
}
public void testDescContains() {
! fileType.setDesc( "nameisaBcdefg");
assertTrue( "Desc contains abc", query.isMatched( fileType));
}
|
