Menu
▾
▴
jcommander-commit — User commit notifications
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(80) |
Oct
(12) |
Nov
(237) |
Dec
(210) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(344) |
Feb
(311) |
Mar
(239) |
Apr
(72) |
May
(8) |
Jun
|
Jul
(73) |
Aug
(88) |
Sep
(235) |
Oct
(111) |
Nov
(325) |
Dec
(220) |
| 2006 |
Jan
(108) |
Feb
(64) |
Mar
(381) |
Apr
(98) |
May
(38) |
Jun
(16) |
Jul
(34) |
Aug
(70) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2007 |
Jan
(22) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(12) |
| 2010 |
Jan
(49) |
Feb
(9) |
Mar
(2) |
Apr
(17) |
May
(10) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Dan C. <cor...@us...> - 2010-04-19 20:55:37
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.intro/META-INF In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8739/META-INF Modified Files: Tag: VER_0_7_2 MANIFEST.MF Log Message: Fixes to work with RCP 3.5 Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.intro/META-INF/MANIFEST.MF,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -C2 -d -r1.7 -r1.7.4.1 *** MANIFEST.MF 6 Aug 2006 10:32:08 -0000 1.7 --- MANIFEST.MF 19 Apr 2010 20:55:28 -0000 1.7.4.1 *************** *** 10,14 **** org.eclipse.core.runtime, org.eclipse.ui.intro, ! org.apache.log4j Eclipse-LazyStart: true Export-Package: org.jcommander.ui.intro --- 10,14 ---- org.eclipse.core.runtime, org.eclipse.ui.intro, ! org.jcommander.ui.logger;bundle-version="0.7.1" Eclipse-LazyStart: true Export-Package: org.jcommander.ui.intro |
|
From: Dan C. <cor...@us...> - 2010-04-19 10:28:24
|
Update of /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/src/org/jcommander/phileas/bookmarks In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4658/src/org/jcommander/phileas/bookmarks Modified Files: Tag: VER_0_7_2 BookmarksFileSystem.java Log Message: Fixed #2989235 Index: BookmarksFileSystem.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/src/org/jcommander/phileas/bookmarks/BookmarksFileSystem.java,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** BookmarksFileSystem.java 6 Aug 2006 10:31:35 -0000 1.6 --- BookmarksFileSystem.java 19 Apr 2010 10:28:15 -0000 1.6.4.1 *************** *** 79,85 **** public void save() { LoggerPlugin.getLogger(getClass()).info("Writing bookmark file to " + rootName.getPath()); - - try { TransformerFactory xformFactory = TransformerFactory.newInstance(); Transformer idTransform; --- 79,84 ---- public void save() { LoggerPlugin.getLogger(getClass()).info("Writing bookmark file to " + rootName.getPath()); + try { TransformerFactory xformFactory = TransformerFactory.newInstance(); Transformer idTransform; *************** *** 87,100 **** Source input = new DOMSource(document); ! Result output = new StreamResult(new FileOutputStream(rootName.getPath())); ! idTransform.transform(input, output); ! } catch (TransformerConfigurationException e) { ! logger.error(e,e); ! } catch (FileNotFoundException e) { ! logger.error(e,e); ! } catch (TransformerException e) { logger.error(e,e); ! } } } --- 86,107 ---- Source input = new DOMSource(document); ! ! FileObject rootFile = VfsManagerExtension.getInstance().resolveFile(rootName.getURI()); ! FileContent rootContent = rootFile.getContent(); ! ! OutputStream outputStream = null; ! try { ! outputStream = rootContent.getOutputStream(); ! Result output = new StreamResult(outputStream); ! idTransform.transform(input, output); ! } finally { ! if (null != outputStream) { ! outputStream.close(); ! } ! } ! } catch (Exception e) { logger.error(e,e); ! } } } |
|
From: Dan C. <cor...@us...> - 2010-03-05 15:14:19
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20176/src/org/jcommander/ui/filepanel/controls Modified Files: Tag: ID_1720501 FileTableControl.java Log Message: Moved all the update code in a single block. Index: FileTableControl.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTableControl.java,v retrieving revision 1.94.2.1 retrieving revision 1.94.2.2 diff -C2 -d -r1.94.2.1 -r1.94.2.2 *** FileTableControl.java 8 Feb 2010 09:16:38 -0000 1.94.2.1 --- FileTableControl.java 5 Mar 2010 15:14:08 -0000 1.94.2.2 *************** *** 27,30 **** --- 27,31 ---- import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; + import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.events.ControlAdapter; import org.eclipse.swt.events.ControlEvent; *************** *** 632,638 **** --- 633,672 ---- try { model.readContentFromFS(); + + // Update the GUI + EclipseBroker.getDisplay().syncExec(new Runnable() { + public void run() { + BusyIndicator.showWhile(EclipseBroker.getDisplay(), new Runnable() { + public void run() { + model.update(); + updateSelection(); + + updateFileSelectionViewer(); + try { + panelMediator.updateDirectoryStats(); + } catch (FileSystemException ex) { + LoggerPlugin.getLogger(this.getClass()).error(ex,ex); + } + + + DirectoryTreeManager dirTreeManager = panelMediator.getFilePanel().getDirectoryTreeManager(); + + if(dirTreeManager != null && panelMediator.getFilePanel().isDirectoryTreeVisible()) { + dirTreeManager.updateDirectoryTree(); + } + } + }); + } + }); + + if(null != rc) { + rc.ok(null); + } } catch (FileSystemException e) { logger.error(e, e); MessageDisplayer.setStatusErrorMessage(e.getMessage()); + if(null != rc) { + rc.exception(e); + } return new Status(Status.WARNING, FilePanelPlugin.ID, "Error reading folder content!", e); } *************** *** 647,681 **** public void done(IJobChangeEvent event) { - IStatus refreshResult = event.getResult(); - if(refreshResult != Status.OK_STATUS) { - if(null != rc) { - rc.exception(refreshResult.getException()); - } - return; - } - EclipseBroker.getDisplay().syncExec(new Runnable() { - public void run() { - model.update(); - updateSelection(); - updateFileSelectionViewer(); - try { - panelMediator.updateDirectoryStats(); - } catch (FileSystemException ex) { - LoggerPlugin.getLogger(this.getClass()).error(ex,ex); - } - - - DirectoryTreeManager dirTreeManager = panelMediator.getFilePanel().getDirectoryTreeManager(); - - if(dirTreeManager != null && panelMediator.getFilePanel().isDirectoryTreeVisible()) { - dirTreeManager.updateDirectoryTree(); - } - if(null != rc) { - rc.ok(null); - } - return; - } - }); } }); --- 681,685 ---- *************** *** 791,795 **** public void exception(Throwable th) { ! MessageDisplayer.displayMessage("Could not switch to " + newFile); FileObject previousParent = model.getPreviousParent(); --- 795,799 ---- public void exception(Throwable th) { ! MessageDisplayer.displayError("Could not switch to " + newFile, th); FileObject previousParent = model.getPreviousParent(); |
|
From: Dan C. <cor...@us...> - 2010-03-05 15:13:45
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.utils/src/org/jcommander/ui/utils In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19671/src/org/jcommander/ui/utils Modified Files: Tag: ID_1720501 MessageDisplayer.java Log Message: Added a new helper method. Index: MessageDisplayer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.utils/src/org/jcommander/ui/utils/MessageDisplayer.java,v retrieving revision 1.11.4.1 retrieving revision 1.11.4.2 diff -C2 -d -r1.11.4.1 -r1.11.4.2 *** MessageDisplayer.java 8 Feb 2010 09:16:34 -0000 1.11.4.1 --- MessageDisplayer.java 5 Mar 2010 15:13:34 -0000 1.11.4.2 *************** *** 133,136 **** --- 133,147 ---- } + public static void displayError(final String msg, Throwable th) { + displayException(th); + Display display = EclipseBroker.getDisplay(); + display.syncExec(new Runnable() { + + public void run() { + MessageDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "", msg); + } + }); + } + public static void displayFeedbackDialog(String title, String message, String link) { final Shell shell = new Shell(EclipseBroker.getShell()); |
|
From: Dan C. <cor...@us...> - 2010-02-08 09:16:48
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8865/src/org/jcommander/ui/filepanel/controls Modified Files: Tag: ID_1720501 FileTableControl.java FilePanel.java Added Files: Tag: ID_1720501 ResultCallback.java Log Message: First version towords fixing Issue #1720501 Index: FilePanel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FilePanel.java,v retrieving revision 1.69 retrieving revision 1.69.2.1 diff -C2 -d -r1.69 -r1.69.2.1 *** FilePanel.java 28 Jan 2010 16:46:04 -0000 1.69 --- FilePanel.java 8 Feb 2010 09:16:38 -0000 1.69.2.1 *************** *** 222,230 **** fileControl.setFileSelectionViewer(fileMarksViewer); ! try { ! fileControl.doRefresh(); ! } catch (FileSystemException ex) { ! MessageDisplayer.displayException(ex); ! } } --- 222,234 ---- fileControl.setFileSelectionViewer(fileMarksViewer); ! fileControl.doRefresh(new ResultCallback() { ! ! public void ok(Object resultValue) { ! } ! ! public void exception(Throwable th) { ! MessageDisplayer.displayException(th); ! } ! }); } Index: FileTableControl.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTableControl.java,v retrieving revision 1.94 retrieving revision 1.94.2.1 diff -C2 -d -r1.94 -r1.94.2.1 *** FileTableControl.java 7 Feb 2010 17:49:47 -0000 1.94 --- FileTableControl.java 8 Feb 2010 09:16:38 -0000 1.94.2.1 *************** *** 620,631 **** } /** * Performs a refresh - * @throws FileSystemException */ ! public void doRefresh() throws FileSystemException { Job job = new Job("Retrieving contents for directory " + model.getCurrentParent().getName().toString()) { protected IStatus run(IProgressMonitor monitor) { ! model.readContentFromFS(); return Status.OK_STATUS; --- 620,640 ---- } + public void doRefresh() { + doRefresh(null); + } + /** * Performs a refresh */ ! public void doRefresh(final ResultCallback rc) { Job job = new Job("Retrieving contents for directory " + model.getCurrentParent().getName().toString()) { protected IStatus run(IProgressMonitor monitor) { ! try { ! model.readContentFromFS(); ! } catch (FileSystemException e) { ! logger.error(e, e); ! MessageDisplayer.setStatusErrorMessage(e.getMessage()); ! return new Status(Status.WARNING, FilePanelPlugin.ID, "Error reading folder content!", e); ! } return Status.OK_STATUS; *************** *** 638,641 **** --- 647,657 ---- public void done(IJobChangeEvent event) { + IStatus refreshResult = event.getResult(); + if(refreshResult != Status.OK_STATUS) { + if(null != rc) { + rc.exception(refreshResult.getException()); + } + return; + } EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { *************** *** 656,659 **** --- 672,679 ---- dirTreeManager.updateDirectoryTree(); } + if(null != rc) { + rc.ok(null); + } + return; } }); *************** *** 761,770 **** } ! public void changeToDirectory(FileObject newFile) { try { if(newFile.getType() == FileType.FOLDER || newFile.getType().hasChildren()) { model.setCurrentParent(newFile); ! ! doRefresh(); } } catch (FileSystemException ex) { --- 781,803 ---- } ! public void changeToDirectory(final FileObject newFile) { try { if(newFile.getType() == FileType.FOLDER || newFile.getType().hasChildren()) { model.setCurrentParent(newFile); ! doRefresh(new ResultCallback() { ! ! public void ok(Object resultValue) { ! } ! ! public void exception(Throwable th) { ! MessageDisplayer.displayMessage("Could not switch to " + newFile); ! ! FileObject previousParent = model.getPreviousParent(); ! if(null != previousParent) { ! model.setCurrentParent(previousParent); ! doRefresh(); ! } ! } ! }); } } catch (FileSystemException ex) { --- NEW FILE: ResultCallback.java --- package org.jcommander.ui.filepanel.controls; import org.eclipse.core.runtime.jobs.Job; /** * Interface used to notify the caller of a method, implemented using * {@link Job}s, of the result of the execution. * * @author Dan Corneanu */ public interface ResultCallback { /** * The execution finished with an {@link Exception}. * @param th */ public void exception(Throwable th); /** * Execution finished normally. * @param resultValue The value returned as a result of the execution. */ public void ok(Object resultValue); } |
|
From: Dan C. <cor...@us...> - 2010-02-08 09:16:48
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.utils/src/org/jcommander/ui/utils In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8852/src/org/jcommander/ui/utils Modified Files: Tag: ID_1720501 MessageDisplayer.java Log Message: First version towords fixing Issue #1720501 Index: MessageDisplayer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.utils/src/org/jcommander/ui/utils/MessageDisplayer.java,v retrieving revision 1.11 retrieving revision 1.11.4.1 diff -C2 -d -r1.11 -r1.11.4.1 *** MessageDisplayer.java 12 Jan 2006 09:56:23 -0000 1.11 --- MessageDisplayer.java 8 Feb 2010 09:16:34 -0000 1.11.4.1 *************** *** 118,128 **** * @param ex The exception that generated the error situation. */ ! public static void displayException(Exception ex) { setStatusErrorMessage(ex.getMessage()); LoggerPlugin.rootLogger.error(ex,ex); } ! public static void displayMessage(String msg) { ! MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "", msg); } --- 118,134 ---- * @param ex The exception that generated the error situation. */ ! public static void displayException(Throwable ex) { setStatusErrorMessage(ex.getMessage()); LoggerPlugin.rootLogger.error(ex,ex); } ! public static void displayMessage(final String msg) { ! Display display = EclipseBroker.getDisplay(); ! display.syncExec(new Runnable() { ! ! public void run() { ! MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), "", msg); ! } ! }); } |
|
From: Dan C. <cor...@us...> - 2010-02-08 09:16:46
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8865/src/org/jcommander/ui/filepanel/actions Modified Files: Tag: ID_1720501 ComputeDirectorySizeAction.java ComputeAllDirectorySizesAction.java Log Message: First version towords fixing Issue #1720501 Index: ComputeAllDirectorySizesAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/ComputeAllDirectorySizesAction.java,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** ComputeAllDirectorySizesAction.java 6 Aug 2006 10:33:24 -0000 1.4 --- ComputeAllDirectorySizesAction.java 8 Feb 2010 09:16:38 -0000 1.4.4.1 *************** *** 74,82 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! try { ! fileControlModel.getControl().doRefresh(); ! } catch (FileSystemException e) { ! logger.error(e,e); ! } } }); --- 74,78 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! fileControlModel.getControl().doRefresh(); } }); Index: ComputeDirectorySizeAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/ComputeDirectorySizeAction.java,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** ComputeDirectorySizeAction.java 6 Aug 2006 10:33:24 -0000 1.6 --- ComputeDirectorySizeAction.java 8 Feb 2010 09:16:38 -0000 1.6.4.1 *************** *** 70,78 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! try { ! fileControlModel.getControl().doRefresh(); ! } catch (FileSystemException e) { ! logger.error(e,e); ! } } }); --- 70,74 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! fileControlModel.getControl().doRefresh(); } }); |
|
From: Dan C. <cor...@us...> - 2010-02-08 09:16:46
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8865/src/org/jcommander/ui/filepanel/model Modified Files: Tag: ID_1720501 FileControlModel.java Log Message: First version towords fixing Issue #1720501 Index: FileControlModel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model/FileControlModel.java,v retrieving revision 1.64 retrieving revision 1.64.2.1 diff -C2 -d -r1.64 -r1.64.2.1 *** FileControlModel.java 7 Feb 2010 17:31:28 -0000 1.64 --- FileControlModel.java 8 Feb 2010 09:16:38 -0000 1.64.2.1 *************** *** 136,140 **** navigationHistoryQueue.add(this.currentParent); ! this.previousParent = currentParent; this.currentParent = currentParent; } --- 136,140 ---- navigationHistoryQueue.add(this.currentParent); ! this.previousParent = this.currentParent; this.currentParent = currentParent; } *************** *** 263,318 **** /** * Reads the content of the {@link #currentParent} from the File System. * @see #update() */ ! public void readContentFromFS() { FileObject[] contents = null; - try { // If the current folder has a valid parent (c:\ for example does // not have a valid parent) ! int startIndex = 1; ! ! if (currentParent.getParent() == null) { ! startIndex = 0; ! } ! ! contents = VfsManagerExtension.getChildren(currentParent); ! if(null == contents) { ! throw new FileSystemException("Content not accessible!"); ! } ! ! if (FilePanelPlugin.getDefault().getPreferenceStore().getBoolean( ! FilePanelPlugin.HIDE_HIDDEN_FILES)) { ! FileObject[] tempList = new FileObject[contents.length]; ! int fileCount = 0; ! for (int i = 0; i < contents.length; i++) { ! if ((!contents[i].isHidden()) ! && (!contents[i].getName().getBaseName() ! .startsWith("."))) { ! tempList[fileCount] = contents[i]; ! fileCount++; ! } ! } ! actualContents = new FileObject[fileCount + startIndex]; ! for (int i = 0; i < fileCount; i++) { ! actualContents[i + startIndex] = tempList[i]; } ! } else { ! actualContents = new FileObject[contents.length + startIndex]; ! for (int i = 0; i < contents.length; i++) { ! actualContents[i + startIndex] = contents[i]; ! } } ! if (startIndex > 0) { ! actualContents[0] = currentParent.getParent(); } ! } catch (FileSystemException ex) { ! MessageDisplayer.displayException(ex); } } --- 263,311 ---- /** * Reads the content of the {@link #currentParent} from the File System. + * @throws FileSystemException * @see #update() */ ! public void readContentFromFS() throws FileSystemException { FileObject[] contents = null; // If the current folder has a valid parent (c:\ for example does // not have a valid parent) ! int startIndex = 1; ! if (currentParent.getParent() == null) { ! startIndex = 0; ! } ! contents = VfsManagerExtension.getChildren(currentParent); ! ! if (FilePanelPlugin.getDefault().getPreferenceStore().getBoolean( ! FilePanelPlugin.HIDE_HIDDEN_FILES)) { ! FileObject[] tempList = new FileObject[contents.length]; ! int fileCount = 0; ! for (int i = 0; i < contents.length; i++) { ! if ((!contents[i].isHidden()) ! && (!contents[i].getName().getBaseName() ! .startsWith("."))) { ! tempList[fileCount] = contents[i]; ! fileCount++; } + } ! actualContents = new FileObject[fileCount + startIndex]; ! for (int i = 0; i < fileCount; i++) { ! actualContents[i + startIndex] = tempList[i]; } ! } else { ! ! actualContents = new FileObject[contents.length + startIndex]; ! for (int i = 0; i < contents.length; i++) { ! actualContents[i + startIndex] = contents[i]; } + } ! if (startIndex > 0) { ! actualContents[0] = currentParent.getParent(); } } |
|
From: Dan C. <cor...@us...> - 2010-02-08 09:16:40
|
Update of /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/src/org/jcommander/vfsextensions In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8839/src/org/jcommander/vfsextensions Modified Files: Tag: ID_1720501 VfsManagerExtension.java Log Message: First version towords fixing Issue #1720501 Index: VfsManagerExtension.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/src/org/jcommander/vfsextensions/VfsManagerExtension.java,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -C2 -d -r1.23 -r1.23.2.1 *** VfsManagerExtension.java 17 Jan 2010 16:28:11 -0000 1.23 --- VfsManagerExtension.java 8 Feb 2010 09:16:28 -0000 1.23.2.1 *************** *** 70,74 **** public static FileObject[] getChildren(FileObject parent) throws FileSystemException { parent.close(); ! return parent.getChildren(); } --- 70,78 ---- public static FileObject[] getChildren(FileObject parent) throws FileSystemException { parent.close(); ! FileObject[] children = parent.getChildren(); ! if(null == children) { ! throw new FileSystemException("Content not accessible!"); ! } ! return children; } *************** *** 216,220 **** FileObject[] children = currentParent.getChildren(); ! if(children.length > 0) { for(int i=0;i<children.length;i++) { if(children[i].getType() == FileType.FOLDER) { --- 220,224 ---- FileObject[] children = currentParent.getChildren(); ! if(null != children && children.length > 0) { for(int i=0;i<children.length;i++) { if(children[i].getType() == FileType.FOLDER) { |
|
From: Dan C. <cor...@us...> - 2010-02-07 17:49:56
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1364/src/org/jcommander/ui/filepanel/controls Modified Files: FileTableControl.java Log Message: Method rename. Index: FileTableControl.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTableControl.java,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** FileTableControl.java 28 Jan 2010 15:50:46 -0000 1.93 --- FileTableControl.java 7 Feb 2010 17:49:47 -0000 1.94 *************** *** 4,30 **** package org.jcommander.ui.filepanel.controls; ! import java.util.*; ! import org.apache.commons.vfs.*; ! import org.apache.log4j.*; ! import org.eclipse.core.runtime.*; ! import org.eclipse.core.runtime.jobs.*; ! import org.eclipse.jface.resource.*; ! import org.eclipse.jface.viewers.*; ! import org.eclipse.jface.viewers.deferred.*; ! import org.eclipse.swt.*; ! import org.eclipse.swt.events.*; ! import org.eclipse.swt.graphics.*; ! import org.eclipse.swt.layout.*; ! import org.eclipse.swt.program.*; ! import org.eclipse.swt.widgets.*; ! import org.jcommander.ui.filepanel.*; ! import org.jcommander.ui.filepanel.actions.*; ! import org.jcommander.ui.filepanel.comparators.*; ! import org.jcommander.ui.filepanel.model.*; ! import org.jcommander.ui.filepanel.preferences.fileextcolor.*; ! import org.jcommander.ui.logger.*; ! import org.jcommander.ui.utils.*; ! import org.jcommander.vfsextensions.*; --- 4,56 ---- package org.jcommander.ui.filepanel.controls; ! import java.util.Comparator; ! import java.util.Iterator; ! import java.util.Set; ! import java.util.Vector; ! import org.apache.commons.vfs.FileObject; ! import org.apache.commons.vfs.FileSystemException; ! import org.apache.commons.vfs.FileType; ! import org.apache.log4j.Logger; ! import org.eclipse.core.runtime.IProgressMonitor; ! import org.eclipse.core.runtime.IStatus; ! import org.eclipse.core.runtime.Status; ! import org.eclipse.core.runtime.jobs.IJobChangeEvent; ! import org.eclipse.core.runtime.jobs.Job; ! import org.eclipse.core.runtime.jobs.JobChangeAdapter; ! import org.eclipse.jface.resource.ColorRegistry; ! import org.eclipse.jface.resource.JFaceResources; ! import org.eclipse.jface.viewers.IContentProvider; ! import org.eclipse.jface.viewers.ILabelProviderListener; ! import org.eclipse.jface.viewers.ITableColorProvider; ! import org.eclipse.jface.viewers.ITableLabelProvider; ! import org.eclipse.jface.viewers.TableViewer; ! import org.eclipse.swt.SWT; ! import org.eclipse.swt.events.ControlAdapter; ! import org.eclipse.swt.events.ControlEvent; ! import org.eclipse.swt.events.MouseAdapter; ! import org.eclipse.swt.events.MouseEvent; ! import org.eclipse.swt.events.SelectionAdapter; ! import org.eclipse.swt.events.SelectionEvent; ! import org.eclipse.swt.graphics.Color; ! import org.eclipse.swt.graphics.Image; ! import org.eclipse.swt.graphics.RGB; ! import org.eclipse.swt.layout.GridData; ! import org.eclipse.swt.program.Program; ! import org.eclipse.swt.widgets.Composite; ! import org.eclipse.swt.widgets.Display; ! import org.eclipse.swt.widgets.Shell; ! import org.eclipse.swt.widgets.Table; ! import org.eclipse.swt.widgets.TableColumn; ! import org.jcommander.ui.filepanel.FilePanelPlugin; ! import org.jcommander.ui.filepanel.actions.ShowSystemContextMenu; ! import org.jcommander.ui.filepanel.comparators.TableComparator; ! import org.jcommander.ui.filepanel.model.FileControlModel; ! import org.jcommander.ui.filepanel.model.FileDetails; ! import org.jcommander.ui.filepanel.preferences.fileextcolor.FileExtColorList; ! import org.jcommander.ui.logger.LoggerPlugin; ! import org.jcommander.ui.utils.EclipseBroker; ! import org.jcommander.ui.utils.MessageDisplayer; ! import org.jcommander.vfsextensions.VfsManagerExtension; *************** *** 601,605 **** Job job = new Job("Retrieving contents for directory " + model.getCurrentParent().getName().toString()) { protected IStatus run(IProgressMonitor monitor) { ! model.getContent(); return Status.OK_STATUS; --- 627,631 ---- Job job = new Job("Retrieving contents for directory " + model.getCurrentParent().getName().toString()) { protected IStatus run(IProgressMonitor monitor) { ! model.readContentFromFS(); return Status.OK_STATUS; |
|
From: Dan C. <cor...@us...> - 2010-02-07 17:31:36
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32021/src/org/jcommander/ui/filepanel/model Modified Files: FileControlModel.java Log Message: Method rename. Added some comments. Index: FileControlModel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model/FileControlModel.java,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** FileControlModel.java 7 Feb 2010 16:02:58 -0000 1.63 --- FileControlModel.java 7 Feb 2010 17:31:28 -0000 1.64 *************** *** 41,44 **** --- 41,45 ---- * * This is the model for the file control. + * This class is not thread safe. */ public class FileControlModel { *************** *** 57,60 **** --- 58,62 ---- protected Hashtable highlightedContents; protected FileObject currentParent; + protected FileDetails[] sortedDetails = new FileDetails[]{}; private FileObject[] actualContents; *************** *** 260,267 **** /** ! * @return Returns the content. ! * @throws PhileasException */ ! public FileObject[] getContent() { FileObject[] contents = null; try { --- 262,269 ---- /** ! * Reads the content of the {@link #currentParent} from the File System. ! * @see #update() */ ! public void readContentFromFS() { FileObject[] contents = null; try { *************** *** 311,318 **** } - return actualContents; } catch (FileSystemException ex) { MessageDisplayer.displayException(ex); - return contents; } } --- 313,318 ---- *************** *** 596,601 **** } public void update() { - if(control.getFileSelectionViewer() != null && actualContents != null) { FileObject[] processedContents = actualContents;//getContent(); --- 596,605 ---- } + /** + * Updates the file details from the already cached content ({@link #actualContents}. + * This method also orders the entries with the files' details. + * @see #readContentFromFS() + */ public void update() { if(control.getFileSelectionViewer() != null && actualContents != null) { FileObject[] processedContents = actualContents;//getContent(); |
|
From: Dan C. <cor...@us...> - 2010-02-07 16:03:06
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv16869/src/org/jcommander/ui/filepanel/model Modified Files: FileControlModel.java Log Message: Static instances of DateFormat are not safe. Index: FileControlModel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model/FileControlModel.java,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** FileControlModel.java 7 Feb 2010 15:32:54 -0000 1.62 --- FileControlModel.java 7 Feb 2010 16:02:58 -0000 1.63 *************** *** 61,65 **** /** Should this be made static? */ ! protected static Hashtable cachedDirectorySizes; protected int entered = 0; --- 61,65 ---- /** Should this be made static? */ ! protected Hashtable cachedDirectorySizes; protected int entered = 0; *************** *** 94,98 **** public void addDirectorySize(FileObject directory, long size) { ! cachedDirectorySizes.put(directory, new Long(size)); } --- 94,98 ---- public void addDirectorySize(FileObject directory, long size) { ! cachedDirectorySizes.put(directory, Long.valueOf(size)); } *************** *** 449,454 **** } - protected static final DateFormat dateFormat = DateFormat - .getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM); static public final int NAME_INDEX = 1; static public final int SIZE_INDEX = 2; --- 449,452 ---- *************** *** 488,491 **** --- 486,491 ---- try { + DateFormat dateFormat = DateFormat.getDateTimeInstance( + DateFormat.MEDIUM, DateFormat.MEDIUM); dateString = dateFormat.format(new Date(file.getContent().getLastModifiedTime())); } catch(FileSystemException ex) { |
|
From: Dan C. <cor...@us...> - 2010-02-07 15:33:07
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13435/src/org/jcommander/ui/filepanel/model Modified Files: FileControlModel.java Log Message: Removed some unused code. Index: FileControlModel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model/FileControlModel.java,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** FileControlModel.java 24 Jan 2010 18:40:17 -0000 1.61 --- FileControlModel.java 7 Feb 2010 15:32:54 -0000 1.62 *************** *** 10,14 **** import java.util.Date; import java.util.Enumeration; - import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; --- 10,13 ---- *************** *** 65,69 **** protected int entered = 0; - protected HashMap contentMappings = new HashMap(); /** The value of the parent directory before the user has exited it. --- 64,67 ---- *************** *** 599,603 **** public void update() { - contentMappings.clear(); if(control.getFileSelectionViewer() != null && actualContents != null) { --- 597,600 ---- *************** *** 608,612 **** for(int i=0;i<processedContents.length;i++) { sortedDetails[i] = getFileDetails(processedContents[i]); - contentMappings.put(sortedDetails[i].getDetails()[NAME_INDEX], processedContents[i]); } control.getSorted(sortedDetails, control.getComparator()); --- 605,608 ---- |
|
From: Dan C. <cor...@us...> - 2010-01-30 14:48:03
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.tests/src/org/jcommander/ui/tests In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6142/src/org/jcommander/ui/tests Modified Files: JCommanderUITest.java Log Message: Some cleaning. Index: JCommanderUITest.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.tests/src/org/jcommander/ui/tests/JCommanderUITest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JCommanderUITest.java 28 Jan 2010 17:54:24 -0000 1.3 --- JCommanderUITest.java 30 Jan 2010 12:30:07 -0000 1.4 *************** *** 149,153 **** } }); ! bot.menu("File").menu("Open Directory URL...").click(); shell = bot.shell("Open Directory URL"); --- 149,153 ---- } }); ! bot.menu("File").menu("Open Directory URL...").click(); shell = bot.shell("Open Directory URL"); *************** *** 156,163 **** bot.comboBox(0).setText(strTarget); bot.button("OK").click(); ! SWTBotTable leftTable = bot.table(0); SWTBotTable rightTable = bot.table(1); ! Assert.assertNotNull(leftTable); Assert.assertNotNull(rightTable); --- 156,163 ---- bot.comboBox(0).setText(strTarget); bot.button("OK").click(); ! SWTBotTable leftTable = bot.table(0); SWTBotTable rightTable = bot.table(1); ! Assert.assertNotNull(leftTable); Assert.assertNotNull(rightTable); *************** *** 169,181 **** } }); ! int rowCount = leftTable.rowCount(); List<String> columnNames = leftTable.columns(); int j = columnNames.indexOf("Name"); ! for(int i = 0; i < rowCount; i++) { SWTBotTableItem tableItem = leftTable.getTableItem(i); String text = tableItem.getText(j); System.err.println(text); ! if(fileToCopy.equals(text.trim())) { System.err.println("Found it !!!"); leftTable.click(i, j); --- 169,181 ---- } }); ! int rowCount = leftTable.rowCount(); List<String> columnNames = leftTable.columns(); int j = columnNames.indexOf("Name"); ! for (int i = 0; i < rowCount; i++) { SWTBotTableItem tableItem = leftTable.getTableItem(i); String text = tableItem.getText(j); System.err.println(text); ! if (fileToCopy.equals(text.trim())) { System.err.println("Found it !!!"); leftTable.click(i, j); *************** *** 183,195 **** } } ! SWTBotButton copyButton = bot.buttonWithId(FilePanelPlugin.SWTBOT_ID_COPY_BUTTON); copyButton.click(); ! shell = bot.shell("Confirm Copy Operation"); shell.activate(); bot.button("OK").click(); ! bot.sleep(1000); ! shell = bot.shell("Copy progress"); shell.activate(); --- 183,196 ---- } } ! SWTBotButton copyButton = bot ! .buttonWithId(FilePanelPlugin.SWTBOT_ID_COPY_BUTTON); copyButton.click(); ! shell = bot.shell("Confirm Copy Operation"); shell.activate(); bot.button("OK").click(); ! bot.sleep(1000); ! shell = bot.shell("Copy progress"); shell.activate(); *************** *** 197,223 **** bot.waitUntil(Conditions.widgetIsEnabled(okButton), 20000); okButton.click(); ! ! //Assert ! boolean found = false; ! rowCount = rightTable.rowCount(); columnNames = rightTable.columns(); j = columnNames.indexOf("Name"); ! for(int i = 0; i < rowCount; i++) { SWTBotTableItem tableItem = rightTable.getTableItem(i); String text = tableItem.getText(j); System.err.println(text); ! if(fileToCopy.equals(text.trim())) { ! found = true; rightTable.click(i, j); break; } } ! Assert.assertTrue("The file " + fileToCopy + ! " should be found in the right pannel!", found); ! TableCollection selection = rightTable.selection(); String selectedFileName = selection.get(0, j); ! Assert.assertEquals(fileToCopy, selectedFileName); } } --- 198,223 ---- bot.waitUntil(Conditions.widgetIsEnabled(okButton), 20000); okButton.click(); ! ! // Assert rowCount = rightTable.rowCount(); columnNames = rightTable.columns(); j = columnNames.indexOf("Name"); ! for (int i = 0; i < rowCount; i++) { SWTBotTableItem tableItem = rightTable.getTableItem(i); String text = tableItem.getText(j); System.err.println(text); ! if (fileToCopy.equals(text.trim())) { rightTable.click(i, j); break; } } ! TableCollection selection = rightTable.selection(); + Assert.assertNotNull(selection); + String selectedFileName = selection.get(0, j); ! Assert.assertEquals("The file " + fileToCopy ! + " should be found in the right pannel!", fileToCopy, ! selectedFileName); } } |
|
From: Dan C. <cor...@us...> - 2010-01-28 17:54:50
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.tests/src/org/jcommander/ui/tests In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29274/src/org/jcommander/ui/tests Modified Files: JCommanderUITest.java Log Message: Some small fixes. Index: JCommanderUITest.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.tests/src/org/jcommander/ui/tests/JCommanderUITest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JCommanderUITest.java 28 Jan 2010 16:48:57 -0000 1.2 --- JCommanderUITest.java 28 Jan 2010 17:54:24 -0000 1.3 *************** *** 24,27 **** --- 24,28 ---- import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; import org.eclipse.swtbot.swt.finder.matchers.WithId; + import org.eclipse.swtbot.swt.finder.utils.TableCollection; import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; *************** *** 209,218 **** if(fileToCopy.equals(text.trim())) { found = true; break; } } - Assert.assertTrue("The file " + fileToCopy + " should be found in the right pannel!", found); } } --- 210,223 ---- if(fileToCopy.equals(text.trim())) { found = true; + rightTable.click(i, j); break; } } Assert.assertTrue("The file " + fileToCopy + " should be found in the right pannel!", found); + + TableCollection selection = rightTable.selection(); + String selectedFileName = selection.get(0, j); + Assert.assertEquals(fileToCopy, selectedFileName); } } |
|
From: Dan C. <cor...@us...> - 2010-01-28 17:54:32
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.tests In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29274 Modified Files: JCommanderUITest.launch Log Message: Some small fixes. Index: JCommanderUITest.launch =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.tests/JCommanderUITest.launch,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JCommanderUITest.launch 28 Jan 2010 16:48:57 -0000 1.2 --- JCommanderUITest.launch 28 Jan 2010 17:54:24 -0000 1.3 *************** *** 33,38 **** <stringAttribute key="product" value="org.jcommander.ui.app.JCommander"/> <booleanAttribute key="run_in_ui_thread" value="false"/> ! <stringAttribute key="selected_target_plugins" value="org.eclipse.ui@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.update.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.persistence.jpa.equinox.weaving@default:false,org.hamcrest.text@default:default,org.eclipse.team.ui@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.http.registry@default:default,org.hamcrest.integration@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.resources.win32.x86@default:false,com.ibm.icu@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.apache.log4j@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.core.databinding.property@default:default,org.hamcrest.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.views@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jface@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.core.resources@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.commons.collections@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.apache.commons.logging@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.text@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.ui.navigator.resources@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.win32@default:false,org.eclipse.help.appserver@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.ui.navigator@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.pde.build@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.update.configurator@3:true,org.eclipse.help.base@default:default,org.eclipse.pde.core@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.easymock@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.variables@default:default,org.eclipse.help@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.pde.ui@default:default,org.eclipse.equinox.concurrent@default:default,javax.servlet@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.jasper@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ant.core@default:default,org.eclipse.ecf@default:default,org.apache.lucene.analysis@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.sat4j.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ant.ui@default:default,org.eclipse.debug.ui@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.compare@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.search@default:default,org.eclipse.ui.externaltools@default:default,javax.servlet.jsp@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.expressions@default:default,org.hamcrest@default:default,org.hamcrest.library@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.p2.core@default:default,org.junit@default:default,org.apache.lucene@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.sat4j.pb@default:default,org.apache.ant@default:default,org.eclipse.equinox.p2.ui@default:default,org.junit4@default:default,org.eclipse.core.filesystem.win32.x86@default:false,javax.transaction@default:false"/> ! <stringAttribute key="selected_workspace_plugins" value="org.jcommander.ui.compare@default:default,org.jcommander.ui.tests@default:default,org.jcommander.ui.filepanel.iconpack.eclipse@default:false,org.jcommander.commons@default:default,org.jcommander.vfsextensions@default:default,org.jcommander.ui.app.iconpack.eclipse@default:false,org.jcommander.ui.externaltools@default:default,org.jcommander.ui.editor@default:default,org.apache.commons@default:default,org.jcommander.ui.fileviewer@default:default,org.jcommander.ui.findfiles.iconpack.eclipse@default:false,org.jcommander.ui.logger@default:default,org.jcommander.update@default:default,org.jcommander.eclipsepatch.compare@default:default,org.jcommander.ui.editor.iconpack.eclipse@default:false,org.jcommander.ui.filepanel@default:default,org.jcommander.tools.nativemanager.ui@default:default,org.jcommander.tests@default:default,org.jcommander.ui.utils@default:default,org.jcommander.ui.findfiles@default:default,org.jcommander.eclipsepatch.progressview@default:default,org.jcommander.systemshell@default:default,org.jcommander.phileas.bookmarks@default:default,org.jcommander.tools.nativemanager@default:default,org.jcommander.ui.intro@default:default,org.apache.commons.vfs.dependencies@default:default,org.jcommander.systemshell.win32@default:false,org.jcommander.ui.app@default:default,org.apache.commons.vfs@default:default,org.jcommander.phileas.platformutils@default:default,org.jcommander.ui.help@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="testApplication" value="org.jcommander.ui.app.JCmdApplication"/> --- 33,38 ---- <stringAttribute key="product" value="org.jcommander.ui.app.JCommander"/> <booleanAttribute key="run_in_ui_thread" value="false"/> ! <stringAttribute key="selected_target_plugins" value="org.eclipse.ui.views.log@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.help@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.junit4@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.repository@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.easymock@default:default,org.eclipse.equinox.http.registry@default:default,org.apache.commons.logging@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.core.filesystem@default:default,org.hamcrest@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.update.core@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.hamcrest.integration@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.persistence.jpa.equinox.weaving@default:false,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.jface@default:default,org.eclipse.core.databinding@default:default,org.apache.jasper@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.security@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.osgi.services@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.compare.core@default:default,org.eclipse.pde.core@default:default,org.eclipse.equinox.p2.publisher@default:default,org.apache.commons.collections@default:default,org.eclipse.help.appserver@default:default,org.eclipse.pde.build@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.sat4j.pb@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,org.apache.lucene.analysis@default:default,org.hamcrest.text@default:default,org.eclipse.update.configurator@3:true,org.hamcrest.library@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.help.base@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.ui.externaltools@default:default,org.eclipse.ant.ui@default:default,org.apache.ant@default:default,org.eclipse.help.ui@default:default,org.eclipse.update.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.debug.core@default:default,org.eclipse.compare@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.win32@default:false,org.eclipse.update.scheduler@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ui.navigator@default:default,org.eclipse.swt@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.core.resources@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.equinox.p2.ui@default:default,org.apache.lucene@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.variables@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ecf@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.update.core.win32@default:false,org.apache.log4j@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ui.console@default:default,org.eclipse.jdt.core@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.registry@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ant.core@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.views@default:default,org.eclipse.text@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ecf.identity@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.forms@default:default,org.eclipse.team.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.apache.commons.el@default:default,com.ibm.icu@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.app@default:default,org.eclipse.team.core@default:default,org.eclipse.osgi@-1:true,javax.transaction@default:false,org.eclipse.debug.ui@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.search@default:default,org.junit@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ui.navigator.resources@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.pde.ui@default:default,org.sat4j.core@default:default"/> ! <stringAttribute key="selected_workspace_plugins" value="org.jcommander.ui.editor.iconpack.eclipse@default:false,org.apache.commons.vfs@default:default,org.jcommander.ui.help@default:default,org.jcommander.tools.nativemanager.ui@default:default,org.jcommander.tests@default:default,org.jcommander.eclipsepatch.compare@default:default,org.jcommander.ui.externaltools@default:default,org.apache.commons.vfs.dependencies@default:default,org.jcommander.ui.fileviewer@default:default,org.jcommander.ui.findfiles@default:default,org.jcommander.ui.findfiles.iconpack.eclipse@default:false,org.jcommander.systemshell@default:default,org.jcommander.ui.app.iconpack.eclipse@default:false,org.jcommander.update@default:default,org.jcommander.ui.logger@default:default,org.jcommander.systemshell.win32@default:false,org.jcommander.ui.app@default:default,org.apache.commons@default:default,org.jcommander.phileas.platformutils@default:default,org.jcommander.ui.filepanel@default:default,org.jcommander.ui.compare@default:default,org.jcommander.ui.intro@default:default,org.jcommander.tools.nativemanager@default:default,org.jcommander.ui.filepanel.iconpack.eclipse@default:false,org.jcommander.commons@default:default,org.jcommander.ui.utils@default:default,org.jcommander.ui.editor@default:default,org.jcommander.vfsextensions@default:default,org.jcommander.ui.tests@default:default,org.jcommander.phileas.bookmarks@default:default,org.jcommander.eclipsepatch.progressview@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="testApplication" value="org.jcommander.ui.app.JCmdApplication"/> |
|
From: Dan C. <cor...@us...> - 2010-01-28 16:49:06
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.tests/src/org/jcommander/ui/tests In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20237/src/org/jcommander/ui/tests Modified Files: JCommanderUITest.java Added Files: jcmd functional testing resources.zip Log Message: Added a test for the "Copy file" scenario. See issue ID: 2932702 --- NEW FILE: jcmd functional testing resources.zip --- (This appears to be a binary file; contents omitted.) Index: JCommanderUITest.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.tests/src/org/jcommander/ui/tests/JCommanderUITest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JCommanderUITest.java 18 Jan 2010 08:19:18 -0000 1.1 --- JCommanderUITest.java 28 Jan 2010 16:48:57 -0000 1.2 *************** *** 3,20 **** import static org.junit.Assert.assertTrue; import java.util.LinkedList; import java.util.List; import org.eclipse.core.runtime.ILogListener; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.swt.finder.SWTBotAssert; import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; ! import org.eclipse.swtbot.swt.finder.widgets.SWTBotLabel; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; import org.jcommander.ui.filepanel.model.FileControlModel; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; --- 3,38 ---- import static org.junit.Assert.assertTrue; + import java.net.URL; import java.util.LinkedList; import java.util.List; + import org.apache.commons.vfs.AllFileSelector; + import org.apache.commons.vfs.FileObject; + import org.apache.commons.vfs.FileSystemManager; + import org.apache.commons.vfs.VFS; + import org.apache.commons.vfs.impl.DefaultFileSystemManager; + import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.ILogListener; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; + import org.eclipse.swt.widgets.Display; import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; + import org.eclipse.swtbot.eclipse.finder.waits.Conditions; + import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; + import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.SWTBotAssert; import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; ! import org.eclipse.swtbot.swt.finder.matchers.WithId; ! import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; + import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; + import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; + import org.jcommander.ui.filepanel.FilePanelPlugin; + import org.jcommander.ui.filepanel.controls.FilePanel; + import org.jcommander.ui.filepanel.controls.FileTab; import org.jcommander.ui.filepanel.model.FileControlModel; import org.junit.AfterClass; + import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; *************** *** 24,36 **** public class JCommanderUITest { private static SWTWorkbenchBot bot; @BeforeClass public static void beforeClass() throws Exception { bot = new SWTWorkbenchBot(); } /** ! * The {@link FileControlModel#update()} sometimes throws an exception. ! * It seems to be some kind of threading problem or something. * * @throws Exception --- 42,76 ---- public class JCommanderUITest { private static SWTWorkbenchBot bot; + private static FileSystemManager manager; + private static FileObject testRoot; @BeforeClass public static void beforeClass() throws Exception { bot = new SWTWorkbenchBot(); + manager = VFS.getManager(); + + URL url = JCommanderUITest.class + .getResource("jcmd functional testing resources.zip"); + url = FileLocator.resolve(url); + String file = url.getFile(); + + FileObject tmpRoot = manager.resolveFile("tmp://"); + tmpRoot.createFolder(); + FileObject zipFile = manager.resolveFile("zip:///" + file); + + tmpRoot.copyFrom(zipFile, new AllFileSelector()); + testRoot = manager.resolveFile(tmpRoot, + "jcmd functional testing resources"); + } + + @AfterClass + public static void afterClass() throws Exception { + bot.sleep(2000); + ((DefaultFileSystemManager) manager).close(); } /** ! * The {@link FileControlModel#update()} sometimes throws an exception. It ! * seems to be some kind of threading problem or something. * * @throws Exception *************** *** 40,54 **** final List<Throwable> exceptions = new LinkedList<Throwable>(); ILogListener listener = new ILogListener() { ! @Override public void logging(IStatus status, String plugin) { // TODO Auto-generated method stub Throwable exception = status.getException(); ! if(exception != null) { exceptions.add(exception); ! } } }; ! Platform.addLogListener(listener); try { --- 80,94 ---- final List<Throwable> exceptions = new LinkedList<Throwable>(); ILogListener listener = new ILogListener() { ! @Override public void logging(IStatus status, String plugin) { // TODO Auto-generated method stub Throwable exception = status.getException(); ! if (exception != null) { exceptions.add(exception); ! } } }; ! Platform.addLogListener(listener); try { *************** *** 61,65 **** Platform.removeLogListener(listener); } ! // No exception should be thrown assertTrue(exceptions.isEmpty()); --- 101,105 ---- Platform.removeLogListener(listener); } ! // No exception should be thrown assertTrue(exceptions.isEmpty()); *************** *** 68,75 **** } ! @AfterClass ! public static void sleep() { ! bot.sleep(2000); ! } } --- 108,218 ---- } ! @Test ! public void testCopy() throws Exception { ! FileObject src = manager.resolveFile(testRoot, "src"); ! FileObject target = manager.resolveFile(testRoot, "target"); ! String fileToCopy = "test1.txt"; ! ! SWTBotView activeView = bot.activeView(); + SWTBot activeBot = activeView.bot(); + final FilePanel leftPanel = (FilePanel) activeBot.widget(WithId + .withId(FilePanelPlugin.SWTBOT_ID_LEFT_PANEL)); + final FilePanel rightPanel = (FilePanel) activeBot.widget(WithId + .withId(FilePanelPlugin.SWTBOT_ID_RIGHT_PANEL)); + + final FileTab fileTab = (FileTab) activeBot.widget(WithId + .withId(FilePanelPlugin.SWTBOT_ID_FILE_TAB)); + + Assert.assertNotNull(leftPanel); + Assert.assertNotNull(rightPanel); + + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + fileTab.setActiveFilePanel(leftPanel); + } + }); + + bot.menu("File").menu("Open Directory URL...").click(); + SWTBotShell shell = bot.shell("Open Directory URL"); + shell.activate(); + String strSrc = src.getURL().toExternalForm(); + bot.comboBox(0).setText(strSrc); + bot.button("OK").click(); + + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + fileTab.setActiveFilePanel(rightPanel); + } + }); + + bot.menu("File").menu("Open Directory URL...").click(); + shell = bot.shell("Open Directory URL"); + shell.activate(); + String strTarget = target.getURL().toExternalForm(); + bot.comboBox(0).setText(strTarget); + bot.button("OK").click(); + + SWTBotTable leftTable = bot.table(0); + SWTBotTable rightTable = bot.table(1); + + Assert.assertNotNull(leftTable); + Assert.assertNotNull(rightTable); + + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + fileTab.setActiveFilePanel(leftPanel); + } + }); + + int rowCount = leftTable.rowCount(); + List<String> columnNames = leftTable.columns(); + int j = columnNames.indexOf("Name"); + for(int i = 0; i < rowCount; i++) { + SWTBotTableItem tableItem = leftTable.getTableItem(i); + String text = tableItem.getText(j); + System.err.println(text); + if(fileToCopy.equals(text.trim())) { + System.err.println("Found it !!!"); + leftTable.click(i, j); + break; + } + } + SWTBotButton copyButton = bot.buttonWithId(FilePanelPlugin.SWTBOT_ID_COPY_BUTTON); + copyButton.click(); + + shell = bot.shell("Confirm Copy Operation"); + shell.activate(); + bot.button("OK").click(); + + bot.sleep(1000); + + shell = bot.shell("Copy progress"); + shell.activate(); + SWTBotButton okButton = bot.button("OK"); + bot.waitUntil(Conditions.widgetIsEnabled(okButton), 20000); + okButton.click(); + + //Assert + boolean found = false; + + rowCount = rightTable.rowCount(); + columnNames = rightTable.columns(); + j = columnNames.indexOf("Name"); + for(int i = 0; i < rowCount; i++) { + SWTBotTableItem tableItem = rightTable.getTableItem(i); + String text = tableItem.getText(j); + System.err.println(text); + if(fileToCopy.equals(text.trim())) { + found = true; + break; + } + } + + Assert.assertTrue("The file " + fileToCopy + + " should be found in the right pannel!", found); + } } |
|
From: Dan C. <cor...@us...> - 2010-01-28 16:49:06
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.tests In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20237 Modified Files: JCommanderUITest.launch Log Message: Added a test for the "Copy file" scenario. See issue ID: 2932702 Index: JCommanderUITest.launch =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.tests/JCommanderUITest.launch,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JCommanderUITest.launch 18 Jan 2010 08:19:17 -0000 1.1 --- JCommanderUITest.launch 28 Jan 2010 16:48:57 -0000 1.2 *************** *** 26,38 **** <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jcommander.ui.tests.JCommanderUITest"/> ! <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -debug"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jcommander.ui.tests"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> ! <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m -Dorg.jcommander.profile=nc"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.jcommander.ui.app.JCommander"/> <booleanAttribute key="run_in_ui_thread" value="false"/> ! <stringAttribute key="selected_target_plugins" value="org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.resources@default:default,org.eclipse.swt@default:default,javax.transaction@default:false,org.eclipse.core.jobs@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.ui.views.log@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.persistence.jpa.equinox.weaving@default:false,javax.servlet.jsp@default:default,org.easymock@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ecf@default:default,org.eclipse.help@default:default,org.eclipse.equinox.security.ui@default:default,org.apache.lucene@default:default,org.apache.log4j@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.text@default:default,org.eclipse.debug.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.update.core.win32@default:false,org.eclipse.help.base@default:default,org.eclipse.pde.build@default:default,org.eclipse.core.variables@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.forms@default:default,org.eclipse.update.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.collections@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.p2.publisher@default:default,org.junit@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.preferences@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.pde.ui@default:default,org.hamcrest@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.compare@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ecf.filetransfer@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.compare.core@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jface@default:default,org.eclipse.core.expressions@default:default,com.ibm.icu@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ant.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.console@default:default,org.hamcrest.library@default:default,org.eclipse.help.appserver@default:default,org.eclipse.jdt.compiler.tool@default:false,org.apache.lucene.analysis@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.ui.win32@default:false,org.eclipse.help.ui@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.pde.core@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.ui@default:default,org.hamcrest.integration@default:default,org.apache.ant@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.resources.compatibility@default:false,org.eclipse.update.configurator@3:true,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.osgi@-1:true,org.sat4j.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.equinox.security@default:default,org.hamcrest.text@default:default,org.eclipse.ui.externaltools@default:default,org.apache.jasper@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jface.text@default:default,org.eclipse.help.webapp@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.databinding.observable@default:default,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.commons.logging@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.search@default:default,org.eclipse.core.net@default:default,org.hamcrest.core@default:default,org.sat4j.pb@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.ui@default:default,javax.servlet@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.team.ui@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.views@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.ui.cheatsheets@default:default,org.junit4@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.mortbay.jetty.util@default:default"/> ! <stringAttribute key="selected_workspace_plugins" value="org.apache.commons.vfs@default:default,org.jcommander.ui.editor.iconpack.eclipse@default:false,org.jcommander.systemshell.win32@default:false,org.apache.commons.vfs.dependencies@default:default,org.jcommander.commons@default:default,org.apache.commons@default:default,org.jcommander.ui.editor@default:default,org.jcommander.eclipsepatch.compare@default:default,org.jcommander.ui.filepanel@default:default,org.jcommander.update@default:default,org.jcommander.ui.tests@default:default,org.jcommander.ui.compare@default:default,org.jcommander.tools.nativemanager.ui@default:default,org.jcommander.ui.externaltools@default:default,org.jcommander.eclipsepatch.progressview@default:default,org.jcommander.systemshell@default:default,org.jcommander.ui.help@default:default,org.jcommander.ui.app@default:default,org.jcommander.ui.utils@default:default,org.jcommander.ui.intro@default:default,org.jcommander.tools.nativemanager@default:default,org.jcommander.ui.filepanel.iconpack.eclipse@default:false,org.jcommander.phileas.platformutils@default:default,org.jcommander.ui.findfiles@default:default,org.jcommander.ui.fileviewer@default:default,org.jcommander.ui.logger@default:default,org.jcommander.ui.app.iconpack.eclipse@default:false,org.jcommander.ui.findfiles.iconpack.eclipse@default:false,org.jcommander.vfsextensions@default:default,org.jcommander.phileas.bookmarks@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="testApplication" value="org.jcommander.ui.app.JCmdApplication"/> --- 26,38 ---- <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jcommander.ui.tests.JCommanderUITest"/> ! <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jcommander.ui.tests"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> ! <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m -Dorg.jcommander.profile=nc -Dorg.eclipse.swtbot.search.defaultKey=org.jcommander.id"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.jcommander.ui.app.JCommander"/> <booleanAttribute key="run_in_ui_thread" value="false"/> ! <stringAttribute key="selected_target_plugins" value="org.eclipse.ui@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.update.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.persistence.jpa.equinox.weaving@default:false,org.hamcrest.text@default:default,org.eclipse.team.ui@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.http.registry@default:default,org.hamcrest.integration@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.core.resources.win32.x86@default:false,com.ibm.icu@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.apache.log4j@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.core.databinding.property@default:default,org.hamcrest.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.views@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jface@default:default,org.eclipse.core.resources.compatibility@default:false,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.core.resources@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.apache.commons.collections@default:default,org.eclipse.equinox.p2.exemplarysetup@default:default,org.apache.commons.logging@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.text@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.ui.navigator.resources@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.swtbot.eclipse.ui@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.win32@default:false,org.eclipse.help.appserver@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.ui.navigator@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.pde.build@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.update.configurator@3:true,org.eclipse.help.base@default:default,org.eclipse.pde.core@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.easymock@default:default,org.eclipse.swtbot.eclipse.spy@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.variables@default:default,org.eclipse.help@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.pde.ui@default:default,org.eclipse.equinox.concurrent@default:default,javax.servlet@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.jasper@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ant.core@default:default,org.eclipse.ecf@default:default,org.apache.lucene.analysis@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.sat4j.core@default:default,org.eclipse.ltk.core.refactoring@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.ant.ui@default:default,org.eclipse.debug.ui@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.compare@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.search@default:default,org.eclipse.ui.externaltools@default:default,javax.servlet.jsp@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.expressions@default:default,org.hamcrest@default:default,org.hamcrest.library@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.p2.core@default:default,org.junit@default:default,org.apache.lucene@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.sat4j.pb@default:default,org.apache.ant@default:default,org.eclipse.equinox.p2.ui@default:default,org.junit4@default:default,org.eclipse.core.filesystem.win32.x86@default:false,javax.transaction@default:false"/> ! <stringAttribute key="selected_workspace_plugins" value="org.jcommander.ui.compare@default:default,org.jcommander.ui.tests@default:default,org.jcommander.ui.filepanel.iconpack.eclipse@default:false,org.jcommander.commons@default:default,org.jcommander.vfsextensions@default:default,org.jcommander.ui.app.iconpack.eclipse@default:false,org.jcommander.ui.externaltools@default:default,org.jcommander.ui.editor@default:default,org.apache.commons@default:default,org.jcommander.ui.fileviewer@default:default,org.jcommander.ui.findfiles.iconpack.eclipse@default:false,org.jcommander.ui.logger@default:default,org.jcommander.update@default:default,org.jcommander.eclipsepatch.compare@default:default,org.jcommander.ui.editor.iconpack.eclipse@default:false,org.jcommander.ui.filepanel@default:default,org.jcommander.tools.nativemanager.ui@default:default,org.jcommander.tests@default:default,org.jcommander.ui.utils@default:default,org.jcommander.ui.findfiles@default:default,org.jcommander.eclipsepatch.progressview@default:default,org.jcommander.systemshell@default:default,org.jcommander.phileas.bookmarks@default:default,org.jcommander.tools.nativemanager@default:default,org.jcommander.ui.intro@default:default,org.apache.commons.vfs.dependencies@default:default,org.jcommander.systemshell.win32@default:false,org.jcommander.ui.app@default:default,org.apache.commons.vfs@default:default,org.jcommander.phileas.platformutils@default:default,org.jcommander.ui.help@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="testApplication" value="org.jcommander.ui.app.JCmdApplication"/> |
|
From: Dan C. <cor...@us...> - 2010-01-28 16:46:18
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19660/src/org/jcommander/ui/filepanel Modified Files: FilePanelPlugin.java FilePanelView.java Log Message: Added IDs to some of the widgets to make finding them in SWTBot tests easiery. Index: FilePanelView.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/FilePanelView.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** FilePanelView.java 6 Feb 2006 17:08:35 -0000 1.28 --- FilePanelView.java 28 Jan 2010 16:46:04 -0000 1.29 *************** *** 65,69 **** public void initialize(TabMediator tabMediator) { setTabMediator(tabMediator); ! this.tabMediator.setFileTab(new FileTab(parent, SWT.NONE, tabMediator)); parent.layout(); --- 65,69 ---- public void initialize(TabMediator tabMediator) { setTabMediator(tabMediator); ! this.tabMediator.setFileTab(new FileTab(parent, SWT.NONE, tabMediator, FilePanelPlugin.SWTBOT_ID_FILE_TAB)); parent.layout(); Index: FilePanelPlugin.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/FilePanelPlugin.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** FilePanelPlugin.java 17 Jan 2010 17:12:03 -0000 1.22 --- FilePanelPlugin.java 28 Jan 2010 16:46:04 -0000 1.23 *************** *** 1,11 **** package org.jcommander.ui.filepanel; ! import java.util.*; ! import org.eclipse.jface.preference.*; ! import org.eclipse.ui.internal.*; ! import org.eclipse.ui.plugin.*; ! import org.jcommander.ui.filepanel.model.*; ! import org.osgi.framework.*; /** --- 1,13 ---- package org.jcommander.ui.filepanel; ! import java.util.MissingResourceException; ! import java.util.ResourceBundle; ! import org.eclipse.jface.preference.IPreferenceStore; ! import org.eclipse.ui.internal.IPreferenceConstants; ! import org.eclipse.ui.internal.WorkbenchPlugin; ! import org.eclipse.ui.plugin.AbstractUIPlugin; ! import org.jcommander.ui.filepanel.model.FileControlModel; ! import org.osgi.framework.BundleContext; /** *************** *** 25,28 **** --- 27,44 ---- //Resource bundle. private ResourceBundle resourceBundle; + + + /** + * The name of the property to be used as Widget ID in SWTBot tests. + * SWTBot will use this property when searching for a widget based on ID. + * Please make sure you define the -Dorg.eclipse.swtbot.search.defaultKey=org.jcommander.id when + * running SWTBot tests. + */ + public static final String SWTBOT_ID_PROPERTY = "org.jcommander.id"; + //IDs' values used for SWTBot based tests + public static final String SWTBOT_ID_FILE_TAB = "org.jcommander.id.filetab"; + public static final String SWTBOT_ID_LEFT_PANEL = "org.jcommander.id.leftFilePanel"; + public static final String SWTBOT_ID_RIGHT_PANEL = "org.jcommander.id.rightFilePanel"; + public static final String SWTBOT_ID_COPY_BUTTON = "org.jcommander.id.rightFilePanel"; public static final String UNDER_1_MIN_COPY_NOTIFICATION = "UNDER_1_MIN_COPY_NOTIFICATION"; |
|
From: Dan C. <cor...@us...> - 2010-01-28 16:46:12
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19660/src/org/jcommander/ui/filepanel/controls Modified Files: FileTab.java FilePanel.java Log Message: Added IDs to some of the widgets to make finding them in SWTBot tests easiery. Index: FilePanel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FilePanel.java,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** FilePanel.java 24 Jan 2010 18:40:17 -0000 1.68 --- FilePanel.java 28 Jan 2010 16:46:04 -0000 1.69 *************** *** 90,95 **** private boolean autoRefresh; ! public FilePanel(FileControlModel model, FileTab fileTab, SashForm sashForm, int style) { super(sashForm, style); this.fileTab = fileTab; this.model = model; --- 90,96 ---- private boolean autoRefresh; ! public FilePanel(FileControlModel model, FileTab fileTab, SashForm sashForm, int style, String id) { super(sashForm, style); + this.setData(FilePanelPlugin.SWTBOT_ID_PROPERTY, id); this.fileTab = fileTab; this.model = model; Index: FileTab.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTab.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** FileTab.java 24 Jan 2010 18:40:17 -0000 1.45 --- FileTab.java 28 Jan 2010 16:46:04 -0000 1.46 *************** *** 49,54 **** protected GridLayout bookmarkPanelsCompositeLayout; ! public FileTab(Composite parent, int style, TabMediator tabMediator) { super(parent, style); this.tabMediator = tabMediator; --- 49,55 ---- protected GridLayout bookmarkPanelsCompositeLayout; ! public FileTab(Composite parent, int style, TabMediator tabMediator, String id) { super(parent, style); + this.setData(FilePanelPlugin.SWTBOT_ID_PROPERTY, id); this.tabMediator = tabMediator; *************** *** 206,210 **** --- 207,214 ---- viewButton = new Button(functionBarComposite, SWT.NONE); editButton = new Button(functionBarComposite, SWT.NONE); + copyButton = new Button(functionBarComposite, SWT.NONE); + copyButton.setData(FilePanelPlugin.SWTBOT_ID_PROPERTY, FilePanelPlugin.SWTBOT_ID_RIGHT_PANEL); + moveButton = new Button(functionBarComposite, SWT.NONE); mkdirButton = new Button(functionBarComposite, SWT.NONE); *************** *** 319,323 **** sashForm.setLayoutData(gridData11); ! leftFilePanel = new FilePanel(tabMediator.getLeftModel(), this, sashForm, SWT.NONE); leftFilePanel.setActive(true); --- 323,327 ---- sashForm.setLayoutData(gridData11); ! leftFilePanel = new FilePanel(tabMediator.getLeftModel(), this, sashForm, SWT.NONE, FilePanelPlugin.SWTBOT_ID_LEFT_PANEL); leftFilePanel.setActive(true); *************** *** 325,329 **** ! rightFilePanel = new FilePanel(tabMediator.getRightModel(), this, sashForm, SWT.NONE); rightBookmarkPanel.setFocusFileControlAdapter(rightFilePanel.getFocusFileControlAdapter()); --- 329,333 ---- ! rightFilePanel = new FilePanel(tabMediator.getRightModel(), this, sashForm, SWT.NONE, FilePanelPlugin.SWTBOT_ID_RIGHT_PANEL); rightBookmarkPanel.setFocusFileControlAdapter(rightFilePanel.getFocusFileControlAdapter()); |
|
From: Dan C. <cor...@us...> - 2010-01-28 16:37:44
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.tests/screenshots In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17979/screenshots Added Files: .cvsignore Removed Files: org.jcommander.ui.tests.JCommanderUITest.jpeg canCreateANewJavaProject(org.jcommander.ui.tests.JCommanderUITest).jpeg fileControlModelUpdateException(org.jcommander.ui.tests.JCommanderUITest).jpeg Log Message: --- fileControlModelUpdateException(org.jcommander.ui.tests.JCommanderUITest).jpeg DELETED --- --- canCreateANewJavaProject(org.jcommander.ui.tests.JCommanderUITest).jpeg DELETED --- --- org.jcommander.ui.tests.JCommanderUITest.jpeg DELETED --- --- NEW FILE: .cvsignore --- *.jpeg |
|
From: Dan C. <cor...@us...> - 2010-01-28 15:50:56
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9609/src/org/jcommander/ui/filepanel/controls Modified Files: FileTableControl.java Log Message: Added a test to guard against index values of -1. Index: FileTableControl.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTableControl.java,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** FileTableControl.java 10 Jan 2010 11:48:56 -0000 1.92 --- FileTableControl.java 28 Jan 2010 15:50:46 -0000 1.93 *************** *** 679,683 **** SELECTED_FLAG); //tableViewer.setInput(model); <- Causes flickering ! tableViewer.update(table.getItem(oldSelection).getData(), null); tableViewer.update(table.getItem(index).getData(), null); } --- 679,685 ---- SELECTED_FLAG); //tableViewer.setInput(model); <- Causes flickering ! if(-1 != oldSelection) { ! tableViewer.update(table.getItem(oldSelection).getData(), null); ! } tableViewer.update(table.getItem(index).getData(), null); } |
|
From: Dan C. <cor...@us...> - 2010-01-24 18:40:28
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25200/src/org/jcommander/ui/filepanel/controls Modified Files: FileTab.java FilePanel.java Log Message: Removed some unused code. Added a check for a null value. Index: FilePanel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FilePanel.java,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** FilePanel.java 6 Aug 2006 10:33:26 -0000 1.67 --- FilePanel.java 24 Jan 2010 18:40:17 -0000 1.68 *************** *** 673,680 **** } - public void listFiles() { - model.update(); - } - public void inPlaceRename() { panelMediator.inPlaceRename(); --- 673,676 ---- Index: FileTab.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTab.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** FileTab.java 4 Jan 2007 15:06:47 -0000 1.44 --- FileTab.java 24 Jan 2010 18:40:17 -0000 1.45 *************** *** 59,63 **** filePanelsComposite.setTabList(new Control[] {sashForm}); sashForm.setTabList(new Control[] {leftFilePanel, rightFilePanel}); - listFiles(); leftBookmarkPanel.setFilePanel(leftFilePanel); --- 59,62 ---- *************** *** 446,459 **** } - /** - * - */ - public void listFiles() { - refreshPartitionInfo(); - - leftFilePanel.listFiles(); - rightFilePanel.listFiles(); - } - public boolean setFocus() { if(leftFilePanel != null) { --- 445,448 ---- |
|
From: Dan C. <cor...@us...> - 2010-01-24 18:40:26
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25200/src/org/jcommander/ui/filepanel/model Modified Files: FileControlModel.java Log Message: Removed some unused code. Added a check for a null value. Index: FileControlModel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model/FileControlModel.java,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** FileControlModel.java 21 Jan 2010 09:12:36 -0000 1.60 --- FileControlModel.java 24 Jan 2010 18:40:17 -0000 1.61 *************** *** 58,62 **** protected Hashtable highlightedContents; protected FileObject currentParent; - protected FileObject[] contents; protected FileDetails[] sortedDetails = new FileDetails[]{}; private FileObject[] actualContents; --- 58,61 ---- *************** *** 267,270 **** --- 266,270 ---- */ public FileObject[] getContent() { + FileObject[] contents = null; try { // If the current folder has a valid parent (c:\ for example does *************** *** 277,281 **** } ! this.contents = VfsManagerExtension.getChildren(currentParent); if (FilePanelPlugin.getDefault().getPreferenceStore().getBoolean( --- 277,284 ---- } ! contents = VfsManagerExtension.getChildren(currentParent); ! if(null == contents) { ! throw new FileSystemException("Content not accessible!"); ! } if (FilePanelPlugin.getDefault().getPreferenceStore().getBoolean( *************** *** 603,607 **** //String[][] actualContents = new String[processedContents.length][]; sortedDetails = new FileDetails[processedContents.length]; ! for(int i=0;i<actualContents.length;i++) { sortedDetails[i] = getFileDetails(processedContents[i]); contentMappings.put(sortedDetails[i].getDetails()[NAME_INDEX], processedContents[i]); --- 606,610 ---- //String[][] actualContents = new String[processedContents.length][]; sortedDetails = new FileDetails[processedContents.length]; ! for(int i=0;i<processedContents.length;i++) { sortedDetails[i] = getFileDetails(processedContents[i]); contentMappings.put(sortedDetails[i].getDetails()[NAME_INDEX], processedContents[i]); *************** *** 624,628 **** public void updateFileMarksViewer() { ! FileObject[] sortedContents = new FileObject[actualContents.length]; for(int i=0;i<sortedContents.length;i++) { --- 627,631 ---- public void updateFileMarksViewer() { ! FileObject[] sortedContents = new FileObject[sortedDetails.length]; for(int i=0;i<sortedContents.length;i++) { |
|
From: Dan C. <cor...@us...> - 2010-01-21 09:12:45
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv21832/src/org/jcommander/ui/filepanel/model Modified Files: FileControlModel.java Log Message: moved the declaration of actualContents to the beginning of the source file. Index: FileControlModel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model/FileControlModel.java,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** FileControlModel.java 10 Jan 2010 11:48:56 -0000 1.59 --- FileControlModel.java 21 Jan 2010 09:12:36 -0000 1.60 *************** *** 60,63 **** --- 60,64 ---- protected FileObject[] contents; protected FileDetails[] sortedDetails = new FileDetails[]{}; + private FileObject[] actualContents; /** Should this be made static? */ *************** *** 454,459 **** static public final int DATE_INDEX = 4; public static final int ICON_INDEX = 0; ! private FileObject[] actualContents; ! /** * Gets an image for a file associated with a given program --- 455,459 ---- static public final int DATE_INDEX = 4; public static final int ICON_INDEX = 0; ! /** * Gets an image for a file associated with a given program |
