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: Robert E. <sky...@us...> - 2006-05-02 09:07:45
|
Update of /cvsroot/jcommander/plugins/org.jcommander.commons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13906 Modified Files: plugin.xml build.properties .classpath Log Message: Included the Jakarta Commons Lang library Index: .classpath =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.commons/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .classpath 11 Nov 2005 06:46:57 -0000 1.1 --- .classpath 2 May 2006 09:07:36 -0000 1.2 *************** *** 2,5 **** --- 2,6 ---- <classpath> <classpathentry kind="src" path="src"/> + <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.1.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> Index: build.properties =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.commons/build.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.properties 11 Nov 2005 06:46:57 -0000 1.1 --- build.properties 2 May 2006 09:07:36 -0000 1.2 *************** *** 2,4 **** output.commons.jar = bin/ bin.includes = plugin.xml,\ ! commons.jar --- 2,6 ---- output.commons.jar = bin/ bin.includes = plugin.xml,\ ! commons.jar,\ ! lib/,\ ! lib/commons-lang-2.1.jar Index: plugin.xml =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.commons/plugin.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plugin.xml 11 Nov 2005 06:46:57 -0000 1.1 --- plugin.xml 2 May 2006 09:07:36 -0000 1.2 *************** *** 4,8 **** id="org.jcommander.commons" name="JCommander Commons Plug-in" ! version="0.7.0" provider-name="JCmd Dev Team" class="org.jcommander.commons.CommonsPlugin"> --- 4,8 ---- id="org.jcommander.commons" name="JCommander Commons Plug-in" ! version="0.7.1" provider-name="JCmd Dev Team" class="org.jcommander.commons.CommonsPlugin"> *************** *** 12,15 **** --- 12,18 ---- <export name="*"/> </library> + <library name="lib/commons-lang-2.1.jar"> + <export name="*"/> + </library> </runtime> |
|
From: Robert E. <sky...@us...> - 2006-05-02 09:07:44
|
Update of /cvsroot/jcommander/plugins/org.jcommander.commons/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13906/lib Added Files: commons-lang-2.1.jar Log Message: Included the Jakarta Commons Lang library --- NEW FILE: commons-lang-2.1.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Robert E. <sky...@us...> - 2006-05-02 09:07:35
|
Update of /cvsroot/jcommander/plugins/org.jcommander.commons/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13855/lib Log Message: Directory /cvsroot/jcommander/plugins/org.jcommander.commons/lib added to the repository |
|
From: Robert E. <sky...@us...> - 2006-05-02 09:07:23
|
Update of /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13654 Modified Files: .classpath plugin.xml Log Message: Added logging Index: .classpath =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .classpath 19 Mar 2006 21:03:59 -0000 1.3 --- .classpath 2 May 2006 09:07:10 -0000 1.4 *************** *** 6,9 **** --- 6,10 ---- <classpathentry kind="lib" path="/org.apache.commons.vfs/commons-vfs-1.0-RC8-SNAPSHOT.jar"/> <classpathentry kind="lib" path="/org.apache.commons.vfs.dependencies/commons-logging-1.0.4.jar"/> + <classpathentry kind="lib" path="/org.jcommander.commons/lib/commons-lang-2.1.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Index: plugin.xml =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/plugin.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** plugin.xml 27 Apr 2006 14:07:44 -0000 1.14 --- plugin.xml 2 May 2006 09:07:10 -0000 1.15 *************** *** 20,23 **** --- 20,24 ---- <import plugin="org.jcommander.vfsextensions"/> <import plugin="org.jcommander.ui.logger"/> + <import plugin="org.jcommander.commons"/> </requires> <extension-point id="contentGenerator" name="Dynamic bookmark group content generator" schema="schema/contentGenerator.exsd"/> |
|
From: Robert E. <sky...@us...> - 2006-05-02 09:07:23
|
Update of /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/src/org/jcommander/phileas/bookmarks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13654/src/org/jcommander/phileas/bookmarks Modified Files: UserDynamicBookmarksGenerator.java Log Message: Added logging Index: UserDynamicBookmarksGenerator.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/src/org/jcommander/phileas/bookmarks/UserDynamicBookmarksGenerator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UserDynamicBookmarksGenerator.java 27 Apr 2006 14:07:43 -0000 1.1 --- UserDynamicBookmarksGenerator.java 2 May 2006 09:07:10 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- import javax.swing.filechooser.FileSystemView; + + import org.apache.commons.lang.builder.ToStringBuilder; + import org.apache.log4j.Logger; import org.eclipse.core.runtime.*; import sun.awt.shell.ShellFolder; *************** *** 18,21 **** --- 21,26 ---- public class UserDynamicBookmarksGenerator implements IDynamicBookmarksGenerator { + protected Logger log = Logger.getLogger(getClass()); + /** * @return the list of OS visible partitions *************** *** 51,54 **** --- 56,61 ---- Bookmark mydocsBookmark = createDefaultBookmark("My Documents", myDocsFile.getAbsolutePath()); bookmarks.add(mydocsBookmark); + } else { + log.warn("Cannot find My Documents in rsRoots[0]: " + ToStringBuilder.reflectionToString(fsRoots[0])); } *************** *** 74,78 **** --- 81,89 ---- } } + } else { + log.warn("Cannot find My Network Places in rsRoots[0]: " + ToStringBuilder.reflectionToString(fsRoots[0])); } + } else { + log.warn("Cannot process fsRoots: " + ToStringBuilder.reflectionToString(fsRoots)); } } |
|
From: Matthias K <mat...@us...> - 2006-04-30 13:11:08
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/old In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1394/src/org/jcommander/ui/filepanel/dialogs/old Added Files: FileQuestionDialogController.java DeleteProgressDialogComposite.java CopyReportDialogComposite.java CustomConfirmDialogComposite.java OperationDialogController.java FileQuestionDialogComposite.java Log Message: further implementation of the move to JFace Dialogs: - deleting files is now a job, thus the DeleteProgressDialog is replaced by the standard job progress dialog - file questions (overwrite, read error, etc) use now JFace dialogs, too. - make directory dialog is now a JFace dialog. --- NEW FILE: DeleteProgressDialogComposite.java --- /* * Created on Jan 16, 2005 */ package org.jcommander.ui.filepanel.dialogs.old; import org.eclipse.swt.*; import org.eclipse.swt.layout.*; import org.eclipse.swt.widgets.*; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.GridData; /** * Composite that serves as the content of the copy progress dialog. * * @author sky_halud */ public class DeleteProgressDialogComposite extends Composite { private Composite progressComposite = null; private Composite buttonsComposite = null; private Button pauseButton = null; private Button abortButton = null; private Composite progressLabelsComposite = null; private ProgressBar totalProgressBar = null; private Label label = null; private Label currentFileLabel = null; private Label label2 = null; public DeleteProgressDialogComposite(Composite parent, int style) { super(parent, style); initialize(); } private void initialize() { createProgressComposite(); createButtonsComposite(); this.setLayout(new GridLayout()); setSize(new org.eclipse.swt.graphics.Point(387, 143)); } /** * This method initializes composite */ private void createProgressComposite() { GridData gridData5 = new GridData(); GridData gridData1 = new GridData(); progressComposite = new Composite(this, SWT.NONE); createProgressLabelsComposite(); totalProgressBar = new ProgressBar(progressComposite, SWT.NONE); progressComposite.setLayout(new GridLayout()); progressComposite.setLayoutData(gridData1); gridData5.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; gridData5.grabExcessHorizontalSpace = true; totalProgressBar.setLayoutData(gridData5); gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; gridData1.grabExcessHorizontalSpace = true; gridData1.grabExcessVerticalSpace = true; gridData1.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER; } /** * This method initializes composite1 */ private void createButtonsComposite() { GridLayout gridLayout3 = new GridLayout(); GridData gridData2 = new GridData(); buttonsComposite = new Composite(this, SWT.NONE); pauseButton = new Button(buttonsComposite, SWT.NONE); abortButton = new Button(buttonsComposite, SWT.NONE); gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.CENTER; gridData2.grabExcessHorizontalSpace = true; gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.END; buttonsComposite.setLayoutData(gridData2); buttonsComposite.setLayout(gridLayout3); gridLayout3.numColumns = 2; gridLayout3.marginHeight = 1; gridLayout3.marginWidth = 1; pauseButton.setText("&Pause"); abortButton.setText("&Abort"); } /** * This method initializes composite */ private void createProgressLabelsComposite() { GridData gridData = new GridData(); gridData.grabExcessHorizontalSpace = true; gridData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; GridLayout gridLayout = new GridLayout(); gridLayout.numColumns = 3; GridData gridData4 = new GridData(); progressLabelsComposite = new Composite(progressComposite, SWT.NONE); label = new Label(progressLabelsComposite, SWT.NONE); currentFileLabel = new Label(progressLabelsComposite, SWT.NONE); label2 = new Label(progressLabelsComposite, SWT.NONE); gridData4.grabExcessHorizontalSpace = true; gridData4.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; progressLabelsComposite.setLayoutData(gridData4); progressLabelsComposite.setLayout(gridLayout); label.setText("Deleting"); currentFileLabel.setText(""); currentFileLabel.setLayoutData(gridData); label2.setText("..."); } public Button getAbortButton() { return abortButton; } public Label getCurrentFileLabel() { return currentFileLabel; } public Button getPauseButton() { return pauseButton; } public ProgressBar getTotalProgressBar() { return totalProgressBar; } } // @jve:decl-index=0:visual-constraint="10,10" --- NEW FILE: OperationDialogController.java --- /* * Created on May 3, 2005 */ package org.jcommander.ui.filepanel.dialogs.old; import org.eclipse.swt.widgets.*; import org.jcommander.ui.filepanel.*; import org.jcommander.ui.filepanel.performers.*; import org.jcommander.ui.utils.*; /** * This is a controller for internal operation dialog lifecycle management. * * @author sky_halud */ public class OperationDialogController { protected Shell shell; protected Object workerLock = new Object(); private boolean resumeOperationThread; protected Object userChoice; protected Shell parent; public OperationDialogController(Shell parent, TabMediator mediator, String title) { this.parent = parent; this.shell = Utils.createOperationDialog(parent, mediator, title); } public void openShell() { shell.open(); } protected void requestShellClose() { resumeOperationThread = true; synchronized(workerLock) { workerLock.notify(); } } protected void setUserChoice(Object choice) { userChoice = choice; requestShellClose(); } public Object waitForUserChoice() { resumeOperationThread = false; while(!resumeOperationThread) { synchronized (workerLock) { try { workerLock.wait(); }catch(InterruptedException ex) {} } } EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { shell.dispose(); } }); return userChoice; } public Shell getShell() { return shell; } protected void accomodateComposite(Composite composite) { Utils.accomodateComposite(composite); } } --- NEW FILE: CopyReportDialogComposite.java --- /* * Created on Dec 13, 2004 */ package org.jcommander.ui.filepanel.dialogs.old; import org.eclipse.swt.widgets.*; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; /** * TODO Insert class comment here. * * @author sky_halud */ public class CopyReportDialogComposite extends Composite { private Composite reportsComposite = null; private Composite buttonsComposite = null; private Button showProcessedButton = null; private Button showSkippedButton = null; private Button dismissButton = null; private Table table = null; public CopyReportDialogComposite(Composite parent, int style) { super(parent, style); initialize(); } private void initialize() { createComposite(); this.setLayout(new GridLayout()); createComposite2(); setSize(new org.eclipse.swt.graphics.Point(353,200)); } /** * This method initializes composite * */ private void createComposite() { GridData gridData1 = new GridData(); reportsComposite = new Composite(this, SWT.NONE); createTable(); gridData1.grabExcessHorizontalSpace = true; gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; gridData1.grabExcessVerticalSpace = true; gridData1.verticalAlignment = org.eclipse.swt.layout.GridData.FILL; reportsComposite.setLayoutData(gridData1); reportsComposite.setLayout(new FillLayout()); } /** * This method initializes composite * */ private void createComposite2() { FillLayout fillLayout3 = new FillLayout(); GridData gridData2 = new GridData(); buttonsComposite = new Composite(this, SWT.NONE); showProcessedButton = new Button(buttonsComposite, SWT.TOGGLE); showSkippedButton = new Button(buttonsComposite, SWT.TOGGLE); dismissButton = new Button(buttonsComposite, SWT.NONE); gridData2.grabExcessHorizontalSpace = true; gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.END; buttonsComposite.setLayoutData(gridData2); buttonsComposite.setLayout(fillLayout3); fillLayout3.spacing = 5; showProcessedButton.setText("Show processed"); showSkippedButton.setText("Show skipped"); dismissButton.setText("Dismiss"); } /** * This method initializes table * */ private void createTable() { table = new Table(reportsComposite, SWT.NONE); TableColumn filenameColumn = new TableColumn(table, SWT.NONE); filenameColumn.setText("Filename"); table.setHeaderVisible(true); } } // @jve:decl-index=0:visual-constraint="10,10" --- NEW FILE: FileQuestionDialogComposite.java --- /* * Created on May 3, 2005 */ package org.jcommander.ui.filepanel.dialogs.old; import org.eclipse.swt.*; import org.eclipse.swt.layout.*; import org.eclipse.swt.widgets.*; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.SWT; /** * This is a composite for various question dialogs. * * @author sky_halud */ public class FileQuestionDialogComposite extends Composite { private Label messageLabel = null; private Composite buttonsComposite = null; private Button currentButton = null; private Button allButton = null; private Button skipCurrentButton = null; private Button skipAllButton = null; private boolean allButtonVisible; public FileQuestionDialogComposite(Composite parent, int style) { this(parent, true, style); } /** * * @param parent * @param allButtonVisible Set the visibility of the "All" button. * @param style */ public FileQuestionDialogComposite(Composite parent, boolean allButtonVisible, int style) { super(parent, style); this.allButtonVisible = allButtonVisible; initialize(); } private void initialize() { GridData gridData3 = new GridData(); gridData3.grabExcessHorizontalSpace = true; gridData3.grabExcessVerticalSpace = true; gridData3.horizontalAlignment = org.eclipse.swt.layout.GridData.CENTER; GridData gridData6 = new GridData(); gridData6.grabExcessHorizontalSpace = true; gridData6.grabExcessVerticalSpace = true; gridData6.horizontalAlignment = org.eclipse.swt.layout.GridData.CENTER; this.setLayout(new GridLayout()); setSize(new org.eclipse.swt.graphics.Point(306,93)); messageLabel = new Label(this, SWT.WRAP | SWT.CENTER); messageLabel.setText("Label"); createButtonsComposite(); messageLabel.setLayoutData(gridData6); } /** * This method initializes composite * */ private void createButtonsComposite() { RowLayout rowLayout5 = new RowLayout(); rowLayout5.fill = true; rowLayout5.justify = false; rowLayout5.pack = true; rowLayout5.wrap = false; GridData gridData4 = new GridData(); gridData4.grabExcessHorizontalSpace = true; gridData4.horizontalAlignment = org.eclipse.swt.layout.GridData.CENTER; buttonsComposite = new Composite(this, SWT.NONE); buttonsComposite.setLayoutData(gridData4); buttonsComposite.setLayout(rowLayout5); currentButton = new Button(buttonsComposite, SWT.NONE); currentButton.setText("&Current"); if(allButtonVisible) { allButton = new Button(buttonsComposite, SWT.NONE); allButton.setText("&All"); } skipCurrentButton = new Button(buttonsComposite, SWT.NONE); skipCurrentButton.setText("&Skip Current"); skipAllButton = new Button(buttonsComposite, SWT.NONE); skipAllButton.setText("Skip A&ll"); } public Button getAllButton() { return allButton; } public Button getCurrentButton() { return currentButton; } public Label getMessageLabel() { return messageLabel; } public Button getSkipAllButton() { return skipAllButton; } public Button getSkipCurrentButton() { return skipCurrentButton; } } // @jve:decl-index=0:visual-constraint="10,117" --- NEW FILE: CustomConfirmDialogComposite.java --- /** * */ package org.jcommander.ui.filepanel.dialogs.old; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.internal.progress.ProgressMessages; /** * @author MatthiasK * */ public class CustomConfirmDialogComposite extends Composite { public static final int YES_NO = 1; public static final int OK_CANCEL = 2; private Composite buttonsComposite = null; private Composite detailsComposite = null; private Composite detailsContent = null; private Button yesButton = null; private Button noButton = null; private Button detailsButton = null; private GridData detailsData = null; private int detailsHeight = 0; private int buttons = 0; /** * @param parent * @param style */ public CustomConfirmDialogComposite(Composite parent, int style, int buttons) { super(parent, style); this.buttons=buttons; initialize(); } private void initialize(){ createMainContent(this); createButtonsComposite(); //mainComposite.setLayout(new GridLayout()); this.setLayout(new GridLayout()); } private void createButtonsComposite(){ detailsComposite = new Composite(this, SWT.NONE); detailsData=new GridData(); detailsData.horizontalAlignment=SWT.FILL; detailsComposite.setLayoutData(detailsData); GridLayout detailsLayout = new GridLayout(); detailsLayout.marginWidth=0; detailsComposite.setLayout(detailsLayout); GridLayout buttonsLayout = new GridLayout(); GridData buttonsData = new GridData(); buttonsComposite = new Composite(this, SWT.NONE); // Label fillLabel = new Label(buttonsComposite, SWT.NONE); // GridData gridDataFill = new GridData(); // gridDataFill.grabExcessHorizontalSpace=true; // gridDataFill.minimumWidth=200; // fillLabel.setLayoutData(gridDataFill); yesButton = new Button(buttonsComposite, SWT.NONE); noButton = new Button(buttonsComposite, SWT.NONE); buttonsData.grabExcessHorizontalSpace = true; buttonsData.horizontalAlignment = org.eclipse.swt.layout.GridData.END; buttonsData.verticalAlignment = org.eclipse.swt.layout.GridData.END; buttonsData.minimumWidth=400; buttonsComposite.setLayoutData(buttonsData); buttonsComposite.setLayout(buttonsLayout); buttonsLayout.numColumns = 3; buttonsLayout.marginHeight = 1; buttonsLayout.marginWidth = 1; buttonsLayout.marginLeft=200; // GridLayout buttonLayout1 = new GridLayout(); GridData yesButtonData = new GridData(); //l1.horizontalAlignment=SWT.FILL; yesButtonData.grabExcessHorizontalSpace=true; yesButtonData.minimumWidth=75; yesButton.setLayoutData(yesButtonData); GridData noButtonData = new GridData(); noButtonData.grabExcessHorizontalSpace=true; //l2.horizontalAlignment=SWT.FILL; noButtonData.minimumWidth=75; noButton.setLayoutData(noButtonData); if (buttons==YES_NO) { yesButton.setText("&Yes"); noButton.setText("&No"); } else if (buttons==OK_CANCEL) { yesButton.setText("&Ok"); noButton.setText("&Cancel"); } detailsButton = new Button(buttonsComposite, SWT.NONE); GridData detailsButtonData = new GridData(); detailsButtonData.grabExcessHorizontalSpace=true; detailsButtonData.minimumWidth=75; detailsButton.setLayoutData(detailsButtonData); detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_DetailsTitle); detailsButton.addSelectionListener(new SelectionAdapter() { // @Override public void widgetSelected(SelectionEvent e) { super.widgetSelected(e); Shell shell = getShell(); Point shellSize = shell.getSize(); Composite composite = buttonsComposite.getParent(); if (detailsContent != null) { detailsContent.dispose(); detailsContent = null; composite.layout(); shell.setSize(shellSize.x, shellSize.y -detailsHeight); detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_DetailsTitle); } else { //Abort if there are no jobs visible /*if (ProgressManager.getInstance().getRootElements(Policy.DEBUG_SHOW_SYSTEM_JOBS).length == 0) { detailsButton.setEnabled(false); return; }*/ detailsContent = new Composite(detailsComposite, SWT.NONE|SWT.BORDER); //detailsContent.setBackground(getDisplay().getSystemColor(SWT.COLOR_WHITE)); GridData detailsCData = new GridData(); detailsCData.horizontalAlignment=SWT.FILL; detailsCData.grabExcessHorizontalSpace=true; //detailsCData.height=200; detailsContent.setLayoutData(detailsCData); detailsContent.setLayout(new RowLayout()); createDetailsContent(detailsContent); /*Button b = new Button(detailsContent, SWT.NONE); b.setText("b");*/ detailsComposite.layout(true); detailsContent.setVisible(true); detailsButton.setText(ProgressMessages.ProgressMonitorJobsDialog_HideTitle); //b.setVisible(true); composite.layout(true); //detailsComposite.setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_RED)); Point p = detailsContent.getSize(); detailsHeight = p.y; shell.setSize(shellSize.x, shellSize.y+detailsHeight); shell.pack(); } } }); } /** * Override this method in a subclass to create the details view * of the dialog. The method is called every time the "Details" button * is clicked to show the view. Thus dialog elements created in this method * are available only if the dialogs are currently showing. * @param parent The parent composite. Make all elements children of this. */ protected void createDetailsContent(Composite parent){ } /** * Override this method in a subclass to create the main * content of the dialog. The method is called in the constructor. * @param parent The parent composite. Make all elements children of this. */ protected void createMainContent(Composite parent){ } /** * Gets the Yes button. */ public Button getYesButton() { return yesButton; } /** * Gets the Ok button. */ public Button getOkButton() { return yesButton; } /** * Gets the no button. */ public Button getNoButton() { return noButton; } /** * Gets the Cancel button. */ public Button getCancelButton() { return noButton; } /** * * @return whether the details are currently showing */ public boolean isDetailsShowing(){ return detailsContent!=null; } } --- NEW FILE: FileQuestionDialogController.java --- /* * Created on May 3, 2005 */ package org.jcommander.ui.filepanel.dialogs.old; import org.eclipse.swt.*; import org.eclipse.swt.events.*; import org.eclipse.swt.widgets.*; import org.jcommander.ui.filepanel.*; import org.jcommander.ui.filepanel.performers.*; import org.jcommander.ui.utils.*; /** * This is a specialized dialog controller for file operation question dialogs. * * @author sky_halud */ public class FileQuestionDialogController extends OperationDialogController { public static final Integer CURRENT_CHOICE = new Integer(1); public static final Integer ALL_CHOICE = new Integer(2); public static final Integer SKIP_CURRENT_CHOICE = new Integer(3); public static final Integer SKIP_ALL_CHOICE = new Integer(4); protected String message; private boolean showAllButton; public FileQuestionDialogController(Shell parent, TabMediator mediator, String title, String message) { this(parent, mediator, title, message, true); } public FileQuestionDialogController(Shell parent, TabMediator mediator, String title, String message, boolean showAllButton) { super(parent, mediator, title); this.message = message; this.showAllButton = showAllButton; } public void openShell() { FileQuestionDialogComposite composite = new FileQuestionDialogComposite(shell, showAllButton, SWT.NONE); composite.getMessageLabel().setText(message); composite.getCurrentButton().addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { setUserChoice(CURRENT_CHOICE); } }); if(composite.getAllButton() != null) { composite.getAllButton().addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { setUserChoice(ALL_CHOICE); } }); } composite.getSkipCurrentButton().addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { setUserChoice(SKIP_CURRENT_CHOICE); } }); composite.getSkipAllButton().addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { setUserChoice(SKIP_ALL_CHOICE); } }); Utils.accomodateComposite(composite); shell.pack(); WindowUtils.centerRelativeTo(shell, parent); shell.setVisible(true); shell.setActive(); super.openShell(); } } |
|
From: Matthias K <mat...@us...> - 2006-04-30 13:11:08
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1394/src/org/jcommander/ui/filepanel Modified Files: FilePanelPlugin.java Log Message: further implementation of the move to JFace Dialogs: - deleting files is now a job, thus the DeleteProgressDialog is replaced by the standard job progress dialog - file questions (overwrite, read error, etc) use now JFace dialogs, too. - make directory dialog is now a JFace dialog. Index: FilePanelPlugin.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/FilePanelPlugin.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** FilePanelPlugin.java 16 Mar 2006 18:21:19 -0000 1.17 --- FilePanelPlugin.java 30 Apr 2006 13:10:55 -0000 1.18 *************** *** 4,7 **** --- 4,9 ---- import org.eclipse.jface.preference.*; + import org.eclipse.ui.internal.IPreferenceConstants; + import org.eclipse.ui.internal.WorkbenchPlugin; import org.eclipse.ui.plugin.*; import org.jcommander.ui.filepanel.model.FileControlModel; *************** *** 78,81 **** --- 80,84 ---- super.start(context); FileControlModel.setShowExtNames(getPreferenceStore().getBoolean(FilePanelPlugin.SHOW_EXT_NAMES)); + WorkbenchPlugin.getDefault().getPreferenceStore().setDefault(IPreferenceConstants.RUN_IN_BACKGROUND, false); } |
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1394/src/org/jcommander/ui/filepanel/performers Modified Files: FileCopyPerformer.java FileDeletePerformer.java UiCopyListener.java MakeDirectoryPerformer.java Log Message: further implementation of the move to JFace Dialogs: - deleting files is now a job, thus the DeleteProgressDialog is replaced by the standard job progress dialog - file questions (overwrite, read error, etc) use now JFace dialogs, too. - make directory dialog is now a JFace dialog. Index: UiCopyListener.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/UiCopyListener.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** UiCopyListener.java 25 Apr 2006 09:27:58 -0000 1.11 --- UiCopyListener.java 30 Apr 2006 13:10:55 -0000 1.12 *************** *** 6,9 **** --- 6,10 ---- import org.apache.commons.vfs.*; import org.apache.log4j.Logger; + import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.*; import org.jcommander.ui.filepanel.*; *************** *** 12,15 **** --- 13,17 ---- import org.jcommander.ui.logger.*; import org.jcommander.ui.utils.*; + import org.jcommander.vfsextensions.VfsManagerExtension; import org.jcommander.vfsextensions.listener.*; *************** *** 20,24 **** private final FileCopyPerformer performer; private final int UPDATE_INTERVAL; ! protected FileQuestionDialogController controller; protected boolean overwriteAll = false; --- 22,27 ---- private final FileCopyPerformer performer; private final int UPDATE_INTERVAL; ! //protected FileQuestionDialogController controller; ! protected int questionResult; protected boolean overwriteAll = false; *************** *** 64,92 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! controller = new FileQuestionDialogController( ! EclipseBroker.getShell(), ! performer.mediator, ! "Overwrite question", ! "Target file \n" + target.getName() + " \nalready exists. \n\nOverwrite?" ! ); ! ! controller.openShell(); } }); ! Object userChoice = controller.waitForUserChoice(); ! if(userChoice == FileQuestionDialogController.CURRENT_CHOICE) { returnValue = true; } else ! if(userChoice == FileQuestionDialogController.SKIP_CURRENT_CHOICE) { returnValue = false; } else ! if(userChoice == FileQuestionDialogController.ALL_CHOICE) { overwriteAll = true; returnValue = overwriteAll; } else ! if(userChoice == FileQuestionDialogController.SKIP_ALL_CHOICE) { skipAll = true; --- 67,96 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! questionResult = MessageDialogAll.openQuestionAll(EclipseBroker.getShell(), "Overwrite?", "Target file \n" + VfsManagerExtension.getDisplayablePath(target) + " \nalready exists. \n\nOverwrite?"); ! // controller = new FileQuestionDialogController( ! // EclipseBroker.getShell(), ! // performer.mediator, ! // "Overwrite question", ! // "Target file \n" + target.getName() + " \nalready exists. \n\nOverwrite?" ! // ); ! // ! // controller.openShell(); } }); ! // Object questionResult = controller.waitForUserChoice(); ! if(questionResult == IDialogConstants.YES_ID) { returnValue = true; } else ! if(questionResult == IDialogConstants.NO_ID) { returnValue = false; } else ! if(questionResult == IDialogConstants.YES_TO_ALL_ID) { overwriteAll = true; returnValue = overwriteAll; } else ! if(questionResult == IDialogConstants.NO_TO_ALL_ID) { skipAll = true; *************** *** 254,278 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! controller = new FileQuestionDialogController( ! EclipseBroker.getShell(), ! performer.mediator, ! "Permissions question", ! "Source file \n" + source.getName() + " \ncannot be read. \n\nRetry?", ! false ! ); ! ! controller.openShell(); } }); ! Object userChoice = controller.waitForUserChoice(); ! if(userChoice == FileQuestionDialogController.CURRENT_CHOICE) { return true; } else ! if(userChoice == FileQuestionDialogController.SKIP_CURRENT_CHOICE) { return false; } else ! if(userChoice == FileQuestionDialogController.SKIP_ALL_CHOICE) { skipAllRead = true; --- 258,283 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! questionResult = MessageDialogAll.openQuestionNoAll(EclipseBroker.getShell(), "Read Error", "Source file \n" + VfsManagerExtension.getDisplayablePath(source) + " \ncannot be read. \n\nRetry?"); ! // controller = new FileQuestionDialogController( ! // EclipseBroker.getShell(), ! // performer.mediator, ! // "Permissions question", ! // "Source file \n" + source.getName() + " \ncannot be read. \n\nRetry?", ! // false ! // ); ! // ! // controller.openShell(); } }); ! // Object questionResult = controller.waitForUserChoice(); ! if(questionResult == IDialogConstants.YES_ID) { return true; } else ! if(questionResult == IDialogConstants.NO_ID) { return false; } else ! if(questionResult == IDialogConstants.NO_TO_ALL_ID) { skipAllRead = true; *************** *** 290,314 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! controller = new FileQuestionDialogController( ! EclipseBroker.getShell(), ! performer.mediator, ! "Permissions question", ! "Target file \n" + target.getName() + " \ncannot be written. \n\nRetry?", ! false ! ); ! ! controller.openShell(); } }); ! Object userChoice = controller.waitForUserChoice(); ! if(userChoice == FileQuestionDialogController.CURRENT_CHOICE) { return true; } else ! if(userChoice == FileQuestionDialogController.SKIP_CURRENT_CHOICE) { return false; } else ! if(userChoice == FileQuestionDialogController.SKIP_ALL_CHOICE) { skipAllWrite = true; --- 295,320 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! questionResult = MessageDialogAll.openQuestionNoAll(EclipseBroker.getShell(), "Write Error", "Target file \n" + VfsManagerExtension.getDisplayablePath(target) + " \ncannot be written. \n\nRetry?"); ! // controller = new FileQuestionDialogController( ! // EclipseBroker.getShell(), ! // performer.mediator, ! // "Write Error", ! // "Target file \n" + target.getName() + " \ncannot be written. \n\nRetry?", ! // false ! // ); ! // ! // controller.openShell(); } }); ! // Object questionResult = controller.waitForUserChoice(); ! if(questionResult == IDialogConstants.YES_ID) { return true; } else ! if(questionResult == IDialogConstants.NO_ID) { return false; } else ! if(questionResult == IDialogConstants.NO_TO_ALL_ID) { skipAllWrite = true; Index: FileCopyPerformer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileCopyPerformer.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** FileCopyPerformer.java 26 Apr 2006 16:39:19 -0000 1.35 --- FileCopyPerformer.java 30 Apr 2006 13:10:55 -0000 1.36 *************** *** 161,165 **** }; ! job.setUser(true); job.setPriority(Job.LONG); job.addJobChangeListener(new JobChangeAdapter() { --- 161,165 ---- }; ! //job.setUser(true); //This makes the job opening in a dialog. job.setPriority(Job.LONG); job.addJobChangeListener(new JobChangeAdapter() { Index: MakeDirectoryPerformer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/MakeDirectoryPerformer.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MakeDirectoryPerformer.java 20 Mar 2006 05:49:24 -0000 1.9 --- MakeDirectoryPerformer.java 30 Apr 2006 13:10:55 -0000 1.10 *************** *** 7,10 **** --- 7,11 ---- import org.apache.commons.vfs.*; + import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.*; import org.eclipse.swt.events.*; *************** *** 41,47 **** protected Object workerLock; ! protected Shell confirmDialog; ! protected MkDirConfirmDialogComposite confirmDialogComposite; public MakeDirectoryPerformer(TabMediator mediator) { --- 42,48 ---- protected Object workerLock; ! protected MakeDirectoryDialog inputDialog; ! //protected MkDirConfirmDialogComposite confirmDialogComposite; public MakeDirectoryPerformer(TabMediator mediator) { *************** *** 72,78 **** }); ! waitForUserChoice(); ! if(selectedOption == OK_OPTION) { // create the directory mkDir(); --- 73,79 ---- }); ! //waitForUserChoice(); ! if(inputDialog.getReturnCode() == IDialogConstants.OK_ID) { // create the directory mkDir(); *************** *** 88,100 **** }); */ - }else { - EclipseBroker.getDisplay().syncExec(new Runnable() { - public void run() { - if(!confirmDialog.isDisposed()) { - confirmDialog.setVisible(false); - } - } - }); } } --- 89,102 ---- }); */ } + // else { + // EclipseBroker.getDisplay().syncExec(new Runnable() { + // public void run() { + // if(!inputDialog.isDisposed()) { + // inputDialog.setVisible(false); + // } + // } + // }); + // } } *************** *** 110,117 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! confirmDialog.setVisible(false); parentDir = sourcePanel.getFileControl().getModel().getCurrentParent(); ! newDirName = confirmDialogComposite.getDirectoryNameText().getText(); } }); --- 112,119 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! // inputDialog.setVisible(false); parentDir = sourcePanel.getFileControl().getModel().getCurrentParent(); ! newDirName = inputDialog.getName(); } }); *************** *** 159,203 **** Shell shell = EclipseBroker.getShell(); ! final SelectionAdapter cancelButtonSelectionAdapter = new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! resumeOperationThread = true; ! selectedOption = CANCEL_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! } ! } ! }; ! ! confirmDialog = Utils.createOperationDialog(shell, mediator); ! confirmDialogComposite = new MkDirConfirmDialogComposite(confirmDialog, SWT.NONE); ! ! confirmDialog.setDefaultButton(confirmDialogComposite.getOkButton()); ! confirmDialog.addShellListener(new ShellAdapter() { ! public void shellClosed(ShellEvent e) { ! cancelButtonSelectionAdapter.widgetSelected(null); ! } ! }); ! ! confirmDialogComposite.getOkButton().addSelectionListener(new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! resumeOperationThread = true; ! selectedOption = OK_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! } ! } ! }); ! ! confirmDialogComposite.getCancelButton().addSelectionListener(cancelButtonSelectionAdapter); ! Utils.accomodateComposite(confirmDialogComposite); ! ! confirmDialog.pack(); ! WindowUtils.centerRelativeTo(confirmDialog, shell); ! confirmDialog.setVisible(true); ! confirmDialog.setActive(); ! confirmDialogComposite.setFocus(); } } --- 161,208 ---- Shell shell = EclipseBroker.getShell(); ! inputDialog = new MakeDirectoryDialog(shell); ! inputDialog.open(); ! // final SelectionAdapter cancelButtonSelectionAdapter = new SelectionAdapter() { ! // public void widgetSelected(SelectionEvent e) { ! // resumeOperationThread = true; ! // selectedOption = CANCEL_OPTION; ! // ! // synchronized (workerLock) { ! // workerLock.notifyAll(); ! // } ! // } ! // }; ! // ! // inputDialog = Utils.createOperationDialog(shell, mediator); ! // confirmDialogComposite = new MkDirConfirmDialogComposite(inputDialog, SWT.NONE); ! // ! // inputDialog.setDefaultButton(confirmDialogComposite.getOkButton()); ! // inputDialog.addShellListener(new ShellAdapter() { ! // public void shellClosed(ShellEvent e) { ! // cancelButtonSelectionAdapter.widgetSelected(null); ! // } ! // }); ! // ! // confirmDialogComposite.getOkButton().addSelectionListener(new SelectionAdapter() { ! // public void widgetSelected(SelectionEvent e) { ! // resumeOperationThread = true; ! // selectedOption = OK_OPTION; ! // ! // synchronized (workerLock) { ! // workerLock.notifyAll(); ! // } ! // } ! // }); ! // ! // confirmDialogComposite.getCancelButton().addSelectionListener(cancelButtonSelectionAdapter); ! // ! // Utils.accomodateComposite(confirmDialogComposite); ! // ! // inputDialog.pack(); ! // WindowUtils.centerRelativeTo(inputDialog, shell); ! // inputDialog.setVisible(true); ! // inputDialog.setActive(); ! // confirmDialogComposite.setFocus(); } } Index: FileDeletePerformer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileDeletePerformer.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** FileDeletePerformer.java 26 Apr 2006 16:39:19 -0000 1.18 --- FileDeletePerformer.java 30 Apr 2006 13:10:55 -0000 1.19 *************** *** 8,15 **** --- 8,24 ---- import org.apache.commons.vfs.*; import org.apache.commons.vfs.provider.local.LocalFile; + import org.eclipse.core.runtime.IProgressMonitor; + import org.eclipse.core.runtime.IStatus; + import org.eclipse.core.runtime.Status; + import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.*; import org.eclipse.swt.events.*; import org.eclipse.swt.widgets.*; + import org.eclipse.ui.PlatformUI; + import org.eclipse.ui.internal.Workbench; + import org.eclipse.ui.internal.progress.ProgressMonitorJobsDialog; + import org.eclipse.ui.internal.progress.ProgressView; + import org.eclipse.ui.progress.UIJob; import org.jcommander.ui.filepanel.*; import org.jcommander.ui.filepanel.controls.*; *************** *** 30,37 **** protected TabMediator mediator; protected Shell confirmDialog; ! protected Shell progressDialog; ! protected DeleteConfirmDialogComposite confirmDialogComposite; protected DeleteConfirmDialog dialog; ! protected DeleteProgressDialogComposite progressDialogComposite; // protected static final int NO_OPTION = 0; --- 39,46 ---- protected TabMediator mediator; protected Shell confirmDialog; ! protected DeleteProgressDialog progressDialog; ! //protected DeleteConfirmDialogComposite confirmDialogComposite; protected DeleteConfirmDialog dialog; ! //protected DeleteProgressDialogComposite progressDialogComposite; // protected static final int NO_OPTION = 0; *************** *** 73,82 **** */ public void run() { ! operationThread = new Thread(new Runnable() { ! public void run() { doDelete(); ! } ! }); ! operationThread.start(); } --- 82,91 ---- */ public void run() { ! // operationThread = new Thread(new Runnable() { ! // public void run() { doDelete(); ! // } ! // }); ! // operationThread.start(); } *************** *** 115,123 **** if(dialog.getReturnCode()==IDialogConstants.YES_ID) { // Display delete progress dialog ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! showProgressDialog(); ! } ! }); // do the deletion --- 124,132 ---- if(dialog.getReturnCode()==IDialogConstants.YES_ID) { // Display delete progress dialog ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // showProgressDialog(); ! // } ! // }); // do the deletion *************** *** 126,130 **** EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! progressDialog.setVisible(false); } }); --- 135,139 ---- EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! //progressDialog.close(); } }); *************** *** 136,209 **** */ protected void performDeletion() { ! // get the inactive/target panel's current directory ! final FilePanel targetPanel = mediator.getFileTab().getInactiveFilePanel(); ! ! DeleteListener deleteListener = new DeleteListener() { ! public void updateStatus(final FileObject sourceFile, final FileObject targetFile, final long bytesProcessed) { ! ! long currentTime = System.currentTimeMillis(); ! ! FileControlModel model = sourcePanel.getFileControl().getModel(); ! if(model.containsMarking(sourceFile) != null) ! model.removeMarking(sourceFile); ! else ! model.removeHighlightedFile(); ! ! if(bytesProcessed == ProgressListener.OPERATION_START) { ! totalFiles ++; ! } ! if(currentTime - prevTime >= UPDATE_INTERVAL) { ! if(bytesProcessed == ProgressListener.OPERATION_START) { ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! progressDialogComposite.getCurrentFileLabel().setText(sourceFile.getName().getRootURI() + sourceFile.getName().getPath()); ! progressDialogComposite.getTotalProgressBar().setSelection(totalFiles); } ! }); } ! prevTime = currentTime; ! } ! } ! }; ! ! try { ! currentStats = VfsManagerExtension.computeStats(sourceFiles); ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! // init the composite with various statistics ! progressDialogComposite.getTotalProgressBar() ! .setMaximum(currentStats.getFileCount()); } ! }); ! ! totalFiles = 0; ! prevTime = 0; ! ! // do the deletion ! if(!VfsManagerExtension.delete(sourceFiles, deleteListener, moveToRecycle)) { ! MessageDisplayer.setStatusErrorMessage("Could not delete files!"); } ! ! } catch (final FileSystemException ex) { ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! MessageDisplayer.displayException(ex); ! } ! }); } ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! try{ ! sourcePanel.refresh(); ! targetPanel.refresh(); ! } catch(FileSystemException ex) { ! MessageDisplayer.displayException(ex); ! } ! } ! }); } --- 145,322 ---- */ protected void performDeletion() { ! class DeleteJob extends Job{ ! ! private IProgressMonitor jobMonitor; ! ! public DeleteJob() { ! super("Delete"); ! } ! ! protected IStatus run(IProgressMonitor monitor) { ! // final Job thisJob = this; ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // Workbench.getInstance().getProgressService().showInDialog(EclipseBroker.getShell(), thisJob); ! // } ! // }); ! jobMonitor = monitor; ! // get the inactive/target panel's current directory ! final FilePanel targetPanel = mediator.getFileTab().getInactiveFilePanel(); ! DeleteListener deleteListener = new DeleteListener() { ! public void updateStatus(final FileObject sourceFile, final FileObject targetFile, final long bytesProcessed) { ! ! long currentTime = System.currentTimeMillis(); ! ! FileControlModel model = sourcePanel.getFileControl().getModel(); ! if(model.containsMarking(sourceFile) != null) ! model.removeMarking(sourceFile); ! else ! model.removeHighlightedFile(); ! ! if(bytesProcessed == ProgressListener.OPERATION_START) { ! totalFiles ++; ! } ! ! if(currentTime - prevTime >= UPDATE_INTERVAL) { ! if(bytesProcessed == ProgressListener.OPERATION_START) { ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! jobMonitor.subTask("Deleting "+VfsManagerExtension.getDisplayablePath(sourceFile)); ! jobMonitor.worked(1); ! // progressDialog.getCurrentFileLabel().setText("Deleting "+sourceFile.getName().getRootURI() + sourceFile.getName().getPath()); ! // progressDialog.getTotalProgressBar().setSelection(totalFiles); ! } ! }); } ! ! prevTime = currentTime; ! } } + }; + + try { + currentStats = VfsManagerExtension.computeStats(sourceFiles); + EclipseBroker.getDisplay().syncExec(new Runnable() { + public void run() { + // init the composite with various statistics + jobMonitor.beginTask("Deleting", currentStats.getFileCount()); + //progressDialog.getTotalProgressBar() + // .setMaximum(currentStats.getFileCount()); + } + }); ! totalFiles = 0; ! prevTime = 0; ! // do the deletion ! if(!VfsManagerExtension.delete(sourceFiles, deleteListener, moveToRecycle)) { ! MessageDisplayer.setStatusErrorMessage("Could not delete files!"); ! } ! ! } catch (final FileSystemException ex) { ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! MessageDisplayer.displayException(ex); ! } ! }); } ! ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! try{ ! sourcePanel.refresh(); ! targetPanel.refresh(); ! } catch(FileSystemException ex) { ! MessageDisplayer.displayException(ex); ! } ! } ! ! }); ! ! return Status.OK_STATUS; } ! ! } ! DeleteJob deleteJob = new DeleteJob(); ! deleteJob.setUser(true); //this makes the Job opening in a dialog. ! deleteJob.schedule(); ! ! //PlatformUI.getWorkbench().getProgressService(); ! //PlatformUI.getWorkbench().get ! ! // // get the inactive/target panel's current directory ! // final FilePanel targetPanel = mediator.getFileTab().getInactiveFilePanel(); ! // ! // DeleteListener deleteListener = new DeleteListener() { ! // public void updateStatus(final FileObject sourceFile, final FileObject targetFile, final long bytesProcessed) { ! // ! // long currentTime = System.currentTimeMillis(); ! // ! // FileControlModel model = sourcePanel.getFileControl().getModel(); ! // if(model.containsMarking(sourceFile) != null) ! // model.removeMarking(sourceFile); ! // else ! // model.removeHighlightedFile(); ! // ! // if(bytesProcessed == ProgressListener.OPERATION_START) { ! // totalFiles ++; ! // } ! // ! // if(currentTime - prevTime >= UPDATE_INTERVAL) { ! // if(bytesProcessed == ProgressListener.OPERATION_START) { ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // progressDialog.getCurrentFileLabel().setText("Deleting "+sourceFile.getName().getRootURI() + sourceFile.getName().getPath()); ! // progressDialog.getTotalProgressBar().setSelection(totalFiles); ! // } ! // }); ! // } ! // ! // prevTime = currentTime; ! // } ! // } ! // }; ! // ! // try { ! // currentStats = VfsManagerExtension.computeStats(sourceFiles); ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // // init the composite with various statistics ! // ! // progressDialog.getTotalProgressBar() ! // .setMaximum(currentStats.getFileCount()); ! // } ! // }); ! // ! // totalFiles = 0; ! // prevTime = 0; ! // ! // // do the deletion ! // if(!VfsManagerExtension.delete(sourceFiles, deleteListener, moveToRecycle)) { ! // MessageDisplayer.setStatusErrorMessage("Could not delete files!"); ! // } ! // ! // } catch (final FileSystemException ex) { ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // MessageDisplayer.displayException(ex); ! // } ! // }); ! // } ! // ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // try{ ! // sourcePanel.refresh(); ! // targetPanel.refresh(); ! // } catch(FileSystemException ex) { ! // MessageDisplayer.displayException(ex); ! // } ! // } ! // ! // }); } *************** *** 214,250 **** Shell shell = EclipseBroker.getShell(); ! progressDialog = Utils.createOperationDialog(shell, mediator); ! progressDialogComposite = new DeleteProgressDialogComposite(progressDialog, SWT.NONE); ! ! progressDialog.setDefaultButton(progressDialogComposite.getPauseButton()); ! progressDialogComposite.getAbortButton().addSelectionListener(new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! /*resumeOperationThread = true; ! selectedOption = OK_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! }*/ ! } ! }); ! progressDialogComposite.getPauseButton().addSelectionListener(new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! /*resumeOperationThread = true; ! selectedOption = CANCEL_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! }*/ ! } ! }); ! Utils.accomodateComposite(progressDialogComposite); ! progressDialog.pack(); ! WindowUtils.centerRelativeTo(progressDialog, shell); ! progressDialog.setVisible(true); ! progressDialog.setActive(); } --- 327,368 ---- Shell shell = EclipseBroker.getShell(); ! progressDialog = new DeleteProgressDialog(shell); ! progressDialog.setBlockOnOpen(false); ! progressDialog.create(); ! // progressDialog = Utils.createOperationDialog(shell, mediator); ! // progressDialogComposite = new DeleteProgressDialogComposite(progressDialog, SWT.NONE); ! // ! // progressDialog.setDefaultButton(progressDialogComposite.getPauseButton()); ! // ! // progressDialogComposite.getAbortButton().addSelectionListener(new SelectionAdapter() { ! // public void widgetSelected(SelectionEvent e) { ! // /*resumeOperationThread = true; ! // selectedOption = OK_OPTION; ! // ! // synchronized (workerLock) { ! // workerLock.notifyAll(); ! // }*/ ! // } ! // }); ! // progressDialogComposite.getPauseButton().addSelectionListener(new SelectionAdapter() { ! // public void widgetSelected(SelectionEvent e) { ! // /*resumeOperationThread = true; ! // selectedOption = CANCEL_OPTION; ! // ! // synchronized (workerLock) { ! // workerLock.notifyAll(); ! // }*/ ! // } ! // }); ! // Utils.accomodateComposite(progressDialogComposite); ! // progressDialog.pack(); ! // WindowUtils.centerRelativeTo(progressDialog, shell); ! // progressDialog.setVisible(true); ! // progressDialog.setActive(); ! progressDialog.open(); } |
|
From: Matthias K <mat...@us...> - 2006-04-30 13:11:05
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1394/src/org/jcommander/ui/filepanel/actions Modified Files: SimpleOpenURLAction.java Log Message: further implementation of the move to JFace Dialogs: - deleting files is now a job, thus the DeleteProgressDialog is replaced by the standard job progress dialog - file questions (overwrite, read error, etc) use now JFace dialogs, too. - make directory dialog is now a JFace dialog. Index: SimpleOpenURLAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/SimpleOpenURLAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SimpleOpenURLAction.java 26 Apr 2006 16:39:19 -0000 1.6 --- SimpleOpenURLAction.java 30 Apr 2006 13:10:55 -0000 1.7 *************** *** 68,71 **** --- 68,72 ---- protected EnterTargetDialog(Shell shell) { super(shell); + //setShellStyle(SWT.DIALOG_TRIM|SWT.MODELESS); } *************** *** 262,267 **** --- 263,270 ---- public void run(IAction action) { EnterTargetDialog dialog = new EnterTargetDialog(window.getShell()); + // dialog.setBlockOnOpen(false); dialog.setHelpAvailable(true); dialog.create(); + // dialog.setBlockOnOpen(false); PlatformUI.getWorkbench().getHelpSystem().setHelp(window.getShell(), "org.jcommander.ui.help.VFS"); dialog.open(); |
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1394/src/org/jcommander/ui/filepanel/dialogs Modified Files: DetailsDialog.java Added Files: MakeDirectoryDialog.java MessageDialogAll.java DeleteProgressDialog.java Removed Files: CopyReportDialogComposite.java OperationDialogController.java FileQuestionDialogController.java CopyConfirmDialogComposite.java DeleteProgressDialogComposite.java DeleteConfirmDialogComposite.java CustomConfirmDialogComposite.java FileQuestionDialogComposite.java Log Message: further implementation of the move to JFace Dialogs: - deleting files is now a job, thus the DeleteProgressDialog is replaced by the standard job progress dialog - file questions (overwrite, read error, etc) use now JFace dialogs, too. - make directory dialog is now a JFace dialog. --- DeleteProgressDialogComposite.java DELETED --- --- CopyConfirmDialogComposite.java DELETED --- --- OperationDialogController.java DELETED --- --- CopyReportDialogComposite.java DELETED --- --- FileQuestionDialogComposite.java DELETED --- --- NEW FILE: MessageDialogAll.java --- /** * */ package org.jcommander.ui.filepanel.dialogs; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; /** * @author MatthiasK * */ public class MessageDialogAll extends MessageDialog { /** * @param parentShell * @param dialogTitle * @param dialogTitleImage * @param dialogMessage * @param dialogImageType * @param dialogButtonLabels * @param defaultIndex */ public MessageDialogAll(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage, int dialogImageType, String[] dialogButtonLabels, int defaultIndex) { super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex); // TODO Auto-generated constructor stub } /** * Convenience method to open a simple Yes/No/YestoAll/NoToAll question dialog. * * @param parent * the parent shell of the dialog, or <code>null</code> if none * @param title * the dialog's title, or <code>null</code> if none * @param message * the message * @return <code>true</code> if the user presses the OK button, * <code>false</code> otherwise */ public static int openQuestionAll(Shell parent, String title, String message) { MessageDialog dialog = new MessageDialog(parent, title, null, // accept // the // default // window // icon message, QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.YES_TO_ALL_LABEL, IDialogConstants.NO_TO_ALL_LABEL }, 0); // yes is the default int result = dialog.open(); switch (result) { case 0: return IDialogConstants.YES_ID; case 1: return IDialogConstants.NO_ID; case 2: return IDialogConstants.YES_TO_ALL_ID; case 3: return IDialogConstants.NO_TO_ALL_ID; default: return 0; } } /** * Convenience method to open a simple Yes/No/YesToAll/NoToAll question dialog. * * @param parent * the parent shell of the dialog, or <code>null</code> if none * @param title * the dialog's title, or <code>null</code> if none * @param message * the message * @param defaultIndex * the number of the default button: Yes=0, No=1, Yes to all=2, No to all=3. * @return <code>true</code> if the user presses the OK button, * <code>false</code> otherwise */ public static int openQuestionAll(Shell parent, String title, String message, int defaultIndex) { MessageDialog dialog = new MessageDialog(parent, title, null, // accept // the // default // window // icon message, QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.YES_TO_ALL_LABEL, IDialogConstants.NO_TO_ALL_LABEL }, defaultIndex); // yes is the default int result = dialog.open(); switch (result) { case 0: return IDialogConstants.YES_ID; case 1: return IDialogConstants.NO_ID; case 2: return IDialogConstants.YES_TO_ALL_ID; case 3: return IDialogConstants.NO_TO_ALL_ID; default: return 0; } } /** * Convenience method to open a simple Yes/No/YestoAll/NoToAll question dialog. * * @param parent * the parent shell of the dialog, or <code>null</code> if none * @param title * the dialog's title, or <code>null</code> if none * @param message * the message * @return <code>true</code> if the user presses the OK button, * <code>false</code> otherwise */ public static int openQuestionNoAll(Shell parent, String title, String message) { MessageDialog dialog = new MessageDialog(parent, title, null, // accept // the // default // window // icon message, QUESTION, new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.NO_TO_ALL_LABEL }, 0); // yes is the default int result = dialog.open(); switch (result) { case 0: return IDialogConstants.YES_ID; case 1: return IDialogConstants.NO_ID; case 2: return IDialogConstants.NO_TO_ALL_ID; default: return 0; } } } --- CustomConfirmDialogComposite.java DELETED --- --- NEW FILE: MakeDirectoryDialog.java --- /** * */ package org.jcommander.ui.filepanel.dialogs; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; /** * @author MatthiasK * */ public class MakeDirectoryDialog extends TitleAreaDialog { Text nameText; String newName; /** * @param parentShell */ public MakeDirectoryDialog(Shell parentShell) { super(parentShell); // TODO Auto-generated constructor stub } protected void configureShell(Shell newShell) { // TODO Auto-generated method stub super.configureShell(newShell); newShell.setText("Create new Directory"); } protected Control createDialogArea(Composite parent) { // TODO Auto-generated method stub setTitle("New Directory"); //setMessage("Enter directory name:"); Composite composite = (Composite)super.createDialogArea(parent); Composite dialog = new Composite(composite, SWT.NONE); dialog.setLayout(new GridLayout()); dialog.setLayoutData(new GridData(GridData.FILL_BOTH)); Label label = new Label(dialog, SWT.NONE); label.setText("Enter new directory name:"); nameText = new Text(dialog, SWT.BORDER); GridData nameData = new GridData(GridData.FILL_HORIZONTAL); nameText.setLayoutData(nameData); Label sep = new Label(parent,SWT.SEPARATOR | SWT.HORIZONTAL); GridData labelData = new GridData(); labelData.grabExcessHorizontalSpace=true; labelData.horizontalAlignment=SWT.FILL; labelData.verticalIndent=50; sep.setLayoutData(labelData); return composite; } public boolean close() { newName = nameText.getText(); return super.close(); } public String getName() { return newName; } } --- FileQuestionDialogController.java DELETED --- Index: DetailsDialog.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/DetailsDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DetailsDialog.java 26 Apr 2006 16:39:19 -0000 1.1 --- DetailsDialog.java 30 Apr 2006 13:10:55 -0000 1.2 *************** *** 1,4 **** /******************************************************************************* ! * from org.eclipse.team.internal.ui.dialogs.DetailsDialog *******************************************************************************/ package org.jcommander.ui.filepanel.dialogs; --- 1,4 ---- /******************************************************************************* ! * adapted from org.eclipse.team.internal.ui.dialogs.DetailsDialog *******************************************************************************/ package org.jcommander.ui.filepanel.dialogs; --- NEW FILE: DeleteProgressDialog.java --- /** * */ package org.jcommander.ui.filepanel.dialogs; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.jface.window.IShellProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.ProgressBar; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Widget; /** * @author MatthiasK * */ public class DeleteProgressDialog extends TrayDialog { private ProgressBar totalProgressBar; private Label currentFileLabel; /** * @param shell */ public DeleteProgressDialog(Shell shell) { super(shell); } /** * @param parentShell */ public DeleteProgressDialog(IShellProvider parentShell) { super(parentShell); } protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.STOP_ID, "Pause", true); createButton(parent, IDialogConstants.ABORT_ID, IDialogConstants.ABORT_LABEL, false); } protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText("Deleting"); setShellStyle(SWT.DIALOG_TRIM|SWT.MODELESS); } protected Control createDialogArea(Composite parent) { // create a composite with standard margins and spacing Composite composite = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(); layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN); layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN); layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING); layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING); composite.setLayout(layout); composite.setLayoutData(new GridData(GridData.FILL_BOTH)); applyDialogFont(composite); GridData gridData5 = new GridData(); currentFileLabel = new Label(composite, SWT.NONE); GridData gridData = new GridData(); gridData.grabExcessHorizontalSpace = true; gridData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; currentFileLabel.setText(""); currentFileLabel.setLayoutData(gridData); totalProgressBar = new ProgressBar(composite, SWT.NONE); gridData5.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; gridData5.grabExcessHorizontalSpace = true; totalProgressBar.setLayoutData(gridData5); return composite; } public ProgressBar getTotalProgressBar() { return totalProgressBar; } public Label getCurrentFileLabel() { return currentFileLabel; } } --- DeleteConfirmDialogComposite.java DELETED --- |
|
From: Matthias K <mat...@us...> - 2006-04-30 13:10:40
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/old In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1342a/src/org/jcommander/ui/filepanel/dialogs/old Log Message: Directory /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/old added to the repository |
|
From: Robert E. <sky...@us...> - 2006-04-29 20:27:55
|
Update of /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.progressview/src/org/eclipse/ui/internal/progress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17572/src/org/eclipse/ui/internal/progress Removed Files: ProgressViewerLabelProvider.java ProgressMonitorFocusJobDialog.java ProgressViewerContentProvider.java ProgressMonitorJobsDialog.java ProgressRegion.java ProgressView.java ProgressViewUpdater.java Log Message: These files are not needed anymore here since these are part of the org.eclipse.ui.workbench plugin since RCP3.2 --- ProgressMonitorFocusJobDialog.java DELETED --- --- ProgressRegion.java DELETED --- --- ProgressView.java DELETED --- --- ProgressViewUpdater.java DELETED --- --- ProgressViewerContentProvider.java DELETED --- --- ProgressViewerLabelProvider.java DELETED --- --- ProgressMonitorJobsDialog.java DELETED --- |
|
From: Robert E. <sky...@us...> - 2006-04-29 20:26:51
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16593 Modified Files: plugin.xml Log Message: Fixed Progress view class name Index: plugin.xml =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/plugin.xml,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** plugin.xml 19 Apr 2006 21:35:55 -0000 1.96 --- plugin.xml 29 Apr 2006 20:26:48 -0000 1.97 *************** *** 1066,1070 **** <view category="org.eclipse.ui" ! class="org.eclipse.ui.internal.progress.JobView" icon="icons/pview.gif" id="org.eclipse.ui.views.ProgressView" --- 1066,1070 ---- <view category="org.eclipse.ui" ! class="org.eclipse.ui.internal.progress.ProgressView" icon="icons/pview.gif" id="org.eclipse.ui.views.ProgressView" |
|
From: Robert E. <sky...@us...> - 2006-04-27 14:07:50
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18771/res Modified Files: jcommander.jcmdbmk.default Log Message: Implemented the following feature requests: [ 1477692 ] Provide bookmark group with common user directories [ 1475436 ] [win32] User bookmark group win32 specific entries Index: jcommander.jcmdbmk.default =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/res/jcommander.jcmdbmk.default,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jcommander.jcmdbmk.default 14 Nov 2005 00:02:17 -0000 1.3 --- jcommander.jcmdbmk.default 27 Apr 2006 14:07:47 -0000 1.4 *************** *** 4,7 **** --- 4,9 ---- <BookmarkGroup Label="Partitions" contentGenerator="org.jcommander.phileas.bookmarks.OsDynamicBookmarksGenerator"/> + <BookmarkGroup Label="User" contentGenerator="org.jcommander.phileas.bookmarks.UserDynamicBookmarksGenerator"/> + <BookmarkGroup Label="QuickDirs"> |
|
From: Robert E. <sky...@us...> - 2006-04-27 14:07:46
|
Update of /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18683 Modified Files: plugin.xml Log Message: Implemented the following feature requests: [ 1477692 ] Provide bookmark group with common user directories [ 1475436 ] [win32] User bookmark group win32 specific entries Index: plugin.xml =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/plugin.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** plugin.xml 15 Feb 2006 10:44:01 -0000 1.13 --- plugin.xml 27 Apr 2006 14:07:44 -0000 1.14 *************** *** 28,30 **** --- 28,35 ---- </extension> + <extension + point="org.jcommander.phileas.bookmarks.contentGenerator"> + <generator class="org.jcommander.phileas.bookmarks.UserDynamicBookmarksGenerator"/> + </extension> + </plugin> |
|
From: Robert E. <sky...@us...> - 2006-04-27 14:07:46
|
Update of /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/src/org/jcommander/phileas/bookmarks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18683/src/org/jcommander/phileas/bookmarks Modified Files: DefaultBookmark.java Added Files: UserDynamicBookmarksGenerator.java ShellFolderBookmark.java Log Message: Implemented the following feature requests: [ 1477692 ] Provide bookmark group with common user directories [ 1475436 ] [win32] User bookmark group win32 specific entries --- NEW FILE: UserDynamicBookmarksGenerator.java --- /* * Created on Apr 27, 2006 */ package org.jcommander.phileas.bookmarks; import java.io.*; import java.util.ArrayList; import javax.swing.filechooser.FileSystemView; import org.eclipse.core.runtime.*; import sun.awt.shell.ShellFolder; /** * This is a content type generator for user specific directories. * * @author sky_halud */ public class UserDynamicBookmarksGenerator implements IDynamicBookmarksGenerator { /** * @return the list of OS visible partitions */ public Bookmark[] generateContent() { ArrayList bookmarks = new ArrayList(); /* Create the user's home directory bookmark */ Bookmark homeBookmark = createDefaultBookmark("Home", System.getProperty("user.home")); bookmarks.add(homeBookmark); /* Create the user's tmp directory bookmark */ Bookmark tmpBookmark = createDefaultBookmark("Temporary Directory", System.getProperty("java.io.tmpdir")); bookmarks.add(tmpBookmark); /********************************************************************************* * WARNING * Next follows a hack that works only for Windows and probably only on Sun JREs *********************************************************************************/ if(Platform.getOS().equals(Platform.OS_WIN32)){ FileSystemView fsView = FileSystemView.getFileSystemView(); File[] fsRoots = fsView.getRoots(); if(fsRoots != null && fsRoots[0].getName().equalsIgnoreCase("Desktop")) { /* Create the desktop bookmark */ Bookmark desktopBookmark = createDefaultBookmark("Desktop", fsRoots[0].getAbsolutePath()); bookmarks.add(desktopBookmark); /* Create the My Documents bookmark */ File myDocsFile = findFolder(fsView, "My Documents", fsRoots[0]); if(myDocsFile != null) { Bookmark mydocsBookmark = createDefaultBookmark("My Documents", myDocsFile.getAbsolutePath()); bookmarks.add(mydocsBookmark); } /* Create My Network Places bookmark */ File myNetworkPlacesFile = findFolder(fsView, "My Network Places", fsRoots[0]); if(myNetworkPlacesFile != null) { DefaultBookmark myNetworkPlacesBookmark = createDefaultBookmark("My Network Places", myDocsFile.getAbsolutePath()); myNetworkPlacesBookmark.setDynamic(true); myNetworkPlacesBookmark.setGroup(true); bookmarks.add(myNetworkPlacesBookmark); File[] children = fsView.getFiles(myNetworkPlacesFile, false); if(children != null) { for(int i=0;i<children.length;i++) { DefaultBookmark crtBookmark = createShellFolderBookmark(children[i]); crtBookmark.setParent(myNetworkPlacesBookmark); myNetworkPlacesBookmark.addChild(crtBookmark); } } } } } return (Bookmark[])bookmarks.toArray(new Bookmark[]{}); } private DefaultBookmark createShellFolderBookmark(File file) { if(file instanceof ShellFolder) { return new ShellFolderBookmark((ShellFolder)file); } else { return null; } } private File findFolder(FileSystemView fsView, String name, File parent) { File[] children = fsView.getFiles(parent, false); for(int i=0;i<children.length;i++) { if(children[i].getName().equalsIgnoreCase(name) || children[i].toString().equalsIgnoreCase(name)) { return children[i]; } } return null; } protected DefaultBookmark createDefaultBookmark(String label, String value) { DefaultBookmark bmk = new DefaultBookmark(); bmk.setLabel(label); bmk.setValue(value); bmk.setGroup(false); return bmk; } } Index: DefaultBookmark.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/src/org/jcommander/phileas/bookmarks/DefaultBookmark.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DefaultBookmark.java 21 Mar 2006 17:01:13 -0000 1.5 --- DefaultBookmark.java 27 Apr 2006 14:07:43 -0000 1.6 *************** *** 18,21 **** --- 18,22 ---- protected ImageDescriptor icon; protected boolean group=true; + private boolean dynamic; public DefaultBookmark(String text) { *************** *** 48,51 **** --- 49,56 ---- } + public void addChild(Bookmark child) { + this.children.add(child); + } + public void addChildren(Bookmark[] children) { for(int i=0;i<children.length;i++) { *************** *** 97,101 **** public boolean isDynamicGroup() { ! return false; } --- 102,110 ---- public boolean isDynamicGroup() { ! return dynamic; ! } ! ! public void setDynamic(boolean dynamic) { ! this.dynamic = dynamic; } *************** *** 107,109 **** --- 116,122 ---- this.group = group; } + + public void setParent(Bookmark parent) { + this.parent = parent; + } } --- NEW FILE: ShellFolderBookmark.java --- package org.jcommander.phileas.bookmarks; import java.io.FileNotFoundException; import sun.awt.shell.ShellFolder; /** * An implementation of the Bookmark class which supports ShellFolder files. * * WARNING Please note that this is most probably a Windows specific feature that works only on Sun JREs. * * @author sky_halud */ public class ShellFolderBookmark extends DefaultBookmark{ protected ShellFolder shellFolder; public ShellFolderBookmark(ShellFolder shellFolder) { this.shellFolder = shellFolder; setLabel(shellFolder.getDisplayName()); } public String getValue() { try { return shellFolder.getLinkLocation().getAbsolutePath(); } catch (FileNotFoundException e) { return ""; } } } |
|
From: Robert E. <sky...@us...> - 2006-04-27 11:14:11
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26615/src/org/jcommander/ui/filepanel/controls Modified Files: FilePanel.java Log Message: Fixed bug [ 1477484 ] "Not focused panels have ..." Proper coloring is implemented for the inactive panel' directory info composite. Index: FilePanel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FilePanel.java,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** FilePanel.java 25 Apr 2006 09:27:57 -0000 1.62 --- FilePanel.java 27 Apr 2006 11:14:02 -0000 1.63 *************** *** 544,549 **** currentDirectoryLabel.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_TITLE_FOREGROUND)); }else { ! directoryInfoComposite.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT)); ! currentDirectoryLabel.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT)); currentDirectoryLabel.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_TITLE_INACTIVE_FOREGROUND)); } --- 544,549 ---- currentDirectoryLabel.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_TITLE_FOREGROUND)); }else { ! directoryInfoComposite.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND)); ! currentDirectoryLabel.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND)); currentDirectoryLabel.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_TITLE_INACTIVE_FOREGROUND)); } |
|
From: Robert E. <sky...@us...> - 2006-04-27 10:33:52
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.utils/src/org/jcommander/ui/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23617/src/org/jcommander/ui/utils Modified Files: WindowUtils.java Log Message: Partial fix for bug [ 1475431 ] Multi-Screens not really supported Index: WindowUtils.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.utils/src/org/jcommander/ui/utils/WindowUtils.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** WindowUtils.java 10 Jan 2006 10:13:33 -0000 1.6 --- WindowUtils.java 27 Apr 2006 10:33:43 -0000 1.7 *************** *** 28,33 **** } ! public static void centerRelativeTo(Shell appShell, Display display) { ! Rectangle parentSize = display.getBounds(); Point childSize = appShell.getSize(); --- 28,33 ---- } ! public static void centerRelativeTo(Shell appShell, Monitor monitor) { ! Rectangle parentSize = monitor.getClientArea(); Point childSize = appShell.getSize(); |
|
From: Robert E. <sky...@us...> - 2006-04-27 10:33:52
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23565/src/org/jcommander/ui/app/actions Modified Files: ChooseProfile.java Log Message: Partial fix for bug [ 1475431 ] Multi-Screens not really supported Index: ChooseProfile.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/actions/ChooseProfile.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ChooseProfile.java 16 Mar 2006 22:23:16 -0000 1.3 --- ChooseProfile.java 27 Apr 2006 10:33:38 -0000 1.4 *************** *** 87,91 **** WindowUtils.centerRelativeTo(dialog, window.getShell()); } else { ! WindowUtils.centerRelativeTo(dialog, dialog.getShell().getDisplay()); } --- 87,91 ---- WindowUtils.centerRelativeTo(dialog, window.getShell()); } else { ! WindowUtils.centerRelativeTo(dialog, dialog.getShell().getDisplay().getPrimaryMonitor()); } |
|
From: Matthias K <mat...@us...> - 2006-04-26 16:39:24
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3053/src/org/jcommander/ui/filepanel/dialogs Modified Files: CopyConfirmDialogComposite.java HideableComposite.java Added Files: DeleteConfirmDialog.java DetailsDialog.java CopyConfirmDialog.java Log Message: first part of migration to JFace dialogs --- NEW FILE: CopyConfirmDialog.java --- /** * */ package org.jcommander.ui.filepanel.dialogs; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.Shell; import org.jcommander.ui.filepanel.FilePanelPlugin; /** * @author MatthiasK * */ public class CopyConfirmDialog extends DetailsDialog { private static String moveMsg = "Move selected files"; private static String copyMsg = "Copy selected files"; private Composite listComposite; private Label labelConfirmQuestion; private List selectionList; private Button keepSelectedCheckBox; private Button deleteCheckBox; private boolean delete; private String target; private String[] names; public CopyConfirmDialog(Shell parentShell) { super(parentShell, "Copy"); // TODO Auto-generated constructor stub } /* (non-Javadoc) * @see org.jcommander.ui.filepanel.dialogs.DetailsDialog#createDropDownDialogArea(org.eclipse.swt.widgets.Composite) */ protected Composite createDropDownDialogArea(Composite parent) { Composite comp = new Composite(parent, SWT.BORDER); comp.setLayout(new GridLayout()); comp.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true)); keepSelectedCheckBox = new Button(comp, SWT.CHECK); keepSelectedCheckBox.setText("&Keep files selected after copying"); keepSelectedCheckBox.setToolTipText("Keeps files selected after they have been copied"); keepSelectedCheckBox.setSelection((FilePanelPlugin.getDefault().getPreferenceStore()). getBoolean(FilePanelPlugin.KEEP_SELECTED_AFTER_COPY_KEY)); keepSelectedCheckBox. addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { try { IPreferenceStore store = FilePanelPlugin.getDefault().getPreferenceStore(); store.setValue(FilePanelPlugin.KEEP_SELECTED_AFTER_COPY_KEY,((Button) e.getSource()).getSelection()); } catch(Exception ex) { //ignore } } }); deleteCheckBox = new Button(comp, SWT.CHECK); deleteCheckBox.setText("&Move files"); deleteCheckBox.setToolTipText("Removes each source file as the copy progresses"); deleteCheckBox.setSelection(delete); updateDeleteCheckbox(); deleteCheckBox .addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { updateDeleteCheckbox(); } }); return comp; } /* (non-Javadoc) * @see org.jcommander.ui.filepanel.dialogs.DetailsDialog#createMainDialogArea(org.eclipse.swt.widgets.Composite) */ protected void createMainDialogArea(Composite parent) { labelConfirmQuestion = new Label(parent, SWT.NONE); labelConfirmQuestion.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false)); labelConfirmQuestion.setText("Copy selected files?"); GridData listCompositeData = new GridData(); listCompositeData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; listCompositeData.grabExcessHorizontalSpace = true; listCompositeData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL; listCompositeData.grabExcessVerticalSpace = true; listCompositeData.minimumWidth=400; GridData selectionListData = new GridData(); //GridData removeButtonData = new GridData(); selectionListData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; selectionListData.grabExcessHorizontalSpace = true; selectionListData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL; selectionListData.grabExcessVerticalSpace = true; //removeButtonData.horizontalAlignment = org.eclipse.swt.layout.GridData.END; //removeButtonData.verticalAlignment = org.eclipse.swt.layout.GridData.BEGINNING; GridLayout listCompositeLayout = new GridLayout(); listCompositeLayout.numColumns = 1; listCompositeLayout.marginWidth=0; listComposite = new Composite(parent, SWT.NONE); listComposite.setLayoutData(listCompositeData); listComposite.setLayout(listCompositeLayout); selectionList = new List(listComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); selectionList.setLayoutData(selectionListData); // removeFileButton = new Button(listComposite, SWT.NONE); // removeFileButton.setLayoutData(gridData2); // removeFileButton.setText("&Remove"); // // removeFileButton.addSelectionListener(new SelectionAdapter() { // public void widgetSelected(SelectionEvent e) { // int [] indices = selectionList.getSelectionIndices(); // selectionList.remove(indices); // // if(selectionList.getItemCount() == 0) { // /** Nothing to copy. Disabling the controls. */ // getYesButton().setEnabled(false); // keepSelectedCheckBox.setEnabled(false); // deleteCheckBox.setEnabled(false); // selectionList.setEnabled(false); // removeFileButton.setEnabled(false); // } // } // }); } /* (non-Javadoc) * @see org.jcommander.ui.filepanel.dialogs.DetailsDialog#getDefaultButtonID() */ int getDefaultButtonID() { return IDialogConstants.OK_ID; } /* (non-Javadoc) * @see org.jcommander.ui.filepanel.dialogs.DetailsDialog#updateEnablements() */ protected void updateEnablements() { } public void setCopyTarget(String target) { this.target=target; updateConfirmMsg(); } public List getSelectionList() { return selectionList; } public void selectDeleteCheckBox(boolean newValue) { delete=newValue; if (isDetailsVisible()){ deleteCheckBox.setSelection(newValue); updateDeleteCheckbox(); } } private void updateDeleteCheckbox() { if(deleteCheckBox.getSelection()){ deleteCheckBox.setForeground(getShell().getDisplay() .getSystemColor(SWT.COLOR_RED)); keepSelectedCheckBox.setSelection(false); keepSelectedCheckBox.setEnabled(false); /*deleteCheckBox.setBackground(getDisplay() .getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));*/ } else { deleteCheckBox.setForeground(getShell().getDisplay() .getSystemColor(SWT.COLOR_WIDGET_FOREGROUND)); keepSelectedCheckBox.setSelection((FilePanelPlugin.getDefault().getPreferenceStore()). getBoolean(FilePanelPlugin.KEEP_SELECTED_AFTER_COPY_KEY)); keepSelectedCheckBox.setEnabled(true); /*deleteCheckBox.setBackground(getDisplay() .getSystemColor(SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW));*/ } delete=deleteCheckBox.getSelection(); updateConfirmMsg(); } public boolean close() { names = selectionList.getItems(); return super.close(); } private String getConfirmMsg(){ return (delete?moveMsg:copyMsg)+((target=="")?"?":" to "+target+"?"); } private void updateConfirmMsg(){ labelConfirmQuestion.setText(getConfirmMsg()); } public boolean isKeptSelected() { return keepSelectedCheckBox.getSelection(); } public Button getKeepSelectedCheckBox() { return keepSelectedCheckBox; } public Button getDeleteCheckBox() { return deleteCheckBox; } public String[] getNames() { return names; } } Index: CopyConfirmDialogComposite.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/CopyConfirmDialogComposite.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CopyConfirmDialogComposite.java 17 Apr 2006 17:58:31 -0000 1.14 --- CopyConfirmDialogComposite.java 26 Apr 2006 16:39:19 -0000 1.15 *************** *** 122,126 **** } ! public void setCopyTarget(String target) { this.target=target; updateConfirmMsg(); --- 122,126 ---- } ! public void setCopyTarget(String target) { this.target=target; updateConfirmMsg(); --- NEW FILE: DetailsDialog.java --- /******************************************************************************* * from org.eclipse.team.internal.ui.dialogs.DetailsDialog *******************************************************************************/ package org.jcommander.ui.filepanel.dialogs; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; /** * A simple superclass for detail button dialogs. */ abstract public class DetailsDialog extends TrayDialog { /** * The Details button. */ private Button detailsButton; /** * The Ok button. */ private Button okButton; /** * The title of the dialog. */ private String title; /** * The error message */ private Label errorMessageLabel; /** * The SWT list control that displays the error details. */ private HideableComposite detailsComposite; //private Composite detailsFrame; /** * Indicates whether the error details viewer is currently created. */ private boolean detailsCreated = false; /** * The key for the image to be displayed (one of the image constants on Dialog) */ private String imageKey = null; /** * Creates a details pane dialog. * Note that the dialog will have no visual representation (no widgets) * until it is told to open. * * @param parentShell the shell under which to create this dialog * @param dialogTitle the title to use for this dialog * @param message the message to show in this dialog * @param status the error to show to the user * @param displayMask the mask to use to filter the displaying of child items, * as per <code>IStatus.matches</code> * @see org.eclipse.core.runtime.IStatus#matches */ public DetailsDialog(Shell parentShell, String dialogTitle) { super(parentShell); this.title = dialogTitle; setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL); } /* (non-Javadoc) * Method declared on Dialog. * Handles the pressing of the Ok or Details button in this dialog. * If the Ok button was pressed then close this dialog. If the Details * button was pressed then toggle the displaying of the error details area. * Note that the Details button will only be visible if the error being * displayed specifies child details. */ protected void buttonPressed(int id) { if (id == IDialogConstants.DETAILS_ID) { // was the details button pressed? toggleDetailsArea(); } else if (id == IDialogConstants.YES_ID) { setReturnCode(IDialogConstants.YES_ID); close(); } else if (id == IDialogConstants.NO_ID) { setReturnCode(IDialogConstants.NO_ID); close(); } else { super.buttonPressed(id); } } /* (non-Javadoc) * Method declared in Window. */ protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(title); } /* (non-Javadoc) * Method declared on Dialog. */ protected void createButtonsForButtonBar(Composite parent) { // create OK and Details buttons if(includeYesButton()) { createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, getDefaultButtonID()==IDialogConstants.YES_ID); } if(includeNoButton()) { createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, getDefaultButtonID()==IDialogConstants.NO_ID); } if(includeOkButton()) { okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, getDefaultButtonID()==IDialogConstants.OK_ID); } if (includeCancelButton()) { createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, getDefaultButtonID()==IDialogConstants.CANCEL_ID); } detailsButton = createButton(parent, IDialogConstants.DETAILS_ID, IDialogConstants.SHOW_DETAILS_LABEL, false); updateEnablements(); } /* (non-Javadoc) * Method declared on Dialog. * Creates and returns the contents of the upper part * of the dialog (above the button bar). */ final protected Control createDialogArea(Composite parent) { // create composite Composite composite = (Composite)super.createDialogArea(parent); // create image Image image = JFaceResources.getImageRegistry().get(getImageKey()); if (image != null) { // create a composite to split the dialog area in two Composite top = new Composite(composite, SWT.NONE); GridLayout layout = new GridLayout(); layout.marginHeight = 0; layout.marginWidth = 0; layout.verticalSpacing = 0; layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING); layout.numColumns = 2; top.setLayout(layout); top.setLayoutData(new GridData(GridData.FILL_BOTH)); // add the image to the left of the composite Label label = new Label(top, 0); image.setBackground(label.getBackground()); label.setImage(image); label.setLayoutData(new GridData( GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_CENTER)); // add a composite to the right to contain the custom components Composite right = new Composite(top, SWT.NONE); layout = new GridLayout(); layout.marginHeight = 0; layout.marginWidth = 0; layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING); layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING); right.setLayout(layout); right.setLayoutData(new GridData(GridData.FILL_BOTH)); createMainDialogArea(right); } else { createMainDialogArea(composite); } if (includeErrorLabel()) { errorMessageLabel = new Label(composite, SWT.NONE); errorMessageLabel.setLayoutData(new GridData( GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL)); errorMessageLabel.setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_RED)); } detailsComposite = new HideableComposite(composite,SWT.NONE) { protected Composite createContents(Composite parent) { // TODO Auto-generated method stub return createDropDownDialogArea(parent); } }; detailsComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); // detailsFrame = new Composite(composite,SWT.NONE); // GridLayout detailsLayout = new GridLayout(); // detailsLayout.marginWidth=0; // detailsLayout.marginHeight=1; // detailsFrame.setLayout(detailsLayout); // detailsFrame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); Dialog.applyDialogFont(parent); return composite; } /** * Creates the dialog's top composite * * @param parent the parent composite */ abstract protected void createMainDialogArea(Composite parent); /** * Create this dialog's drop-down list component. * * @param parent the parent composite * @return the drop-down list component */ abstract protected Composite createDropDownDialogArea(Composite parent); /** * Toggles the unfolding of the details area. This is triggered by * the user pressing the details button. */ private void toggleDetailsArea() { Point windowSize = getShell().getSize(); Point oldSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT); if (detailsCreated) { //detailsComposite.dispose(); detailsComposite.disappear(); detailsCreated = false; detailsButton.setText(IDialogConstants.SHOW_DETAILS_LABEL); } else { //detailsComposite = createDropDownDialogArea(detailsFrame); detailsComposite.appear(); detailsCreated = true; detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL); } Dialog.applyDialogFont(getContents()); Point newSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT); getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y))); } final protected void setErrorMessage(String error) { if(errorMessageLabel != null) { if(error == null || error.length() == 0) { errorMessageLabel.setText(""); //$NON-NLS-1$ } else { errorMessageLabel.setText(error); } errorMessageLabel.update(); } } final protected void setPageComplete(boolean complete) { if(okButton != null ) { okButton.setEnabled(complete); } } abstract protected void updateEnablements(); protected boolean includeCancelButton() { return true; } protected boolean includeOkButton() { return true; } protected boolean includeYesButton() { return false; } protected boolean includeNoButton() { return false; } protected boolean includeErrorLabel() { return false; } abstract int getDefaultButtonID(); /** * Returns the imageKey. * @return String */ protected String getImageKey() { return imageKey; } /** * Sets the imageKey. * @param imageKey The imageKey to set */ protected void setImageKey(String imageKey) { this.imageKey = imageKey; } protected static final int LABEL_WIDTH_HINT = 400; protected Label createWrappingLabel(Composite parent, String text) { Label label = new Label(parent, SWT.LEFT | SWT.WRAP); label.setText(text); GridData data = new GridData(); data.horizontalSpan = 1; data.horizontalAlignment = GridData.FILL; data.horizontalIndent = 0; data.grabExcessHorizontalSpace = true; data.widthHint = LABEL_WIDTH_HINT; label.setLayoutData(data); return label; } protected Composite createComposite(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); GridLayout layout = new GridLayout(); layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN); layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN); layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING); layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING); composite.setLayout(layout); composite.setLayoutData(new GridData(GridData.FILL_BOTH)); return composite; } protected boolean isDetailsVisible() { return detailsCreated; } } Index: HideableComposite.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/HideableComposite.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HideableComposite.java 24 Apr 2006 20:40:58 -0000 1.1 --- HideableComposite.java 26 Apr 2006 16:39:19 -0000 1.2 *************** *** 4,10 **** package org.jcommander.ui.filepanel.dialogs; - import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; - import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; --- 4,8 ---- *************** *** 15,19 **** * */ ! public class HideableComposite{ protected Composite composite; --- 13,17 ---- * */ ! public abstract class HideableComposite{ protected Composite composite; *************** *** 39,50 **** if (!visible) { Point p = composite.getShell().getSize(); ! contents = new Composite(composite,SWT.NONE); ! GridData contentsData = new GridData(); ! contentsData.horizontalAlignment=SWT.FILL; ! contentsData.grabExcessHorizontalSpace=true; ! contents.setLayoutData(contentsData); ! GridLayout contentsLayout = new GridLayout(); ! contents.setLayout(contentsLayout); ! createContents(contents); composite.getShell().pack(); height=composite.getSize().y; --- 37,41 ---- if (!visible) { Point p = composite.getShell().getSize(); ! contents = createContents(composite); composite.getShell().pack(); height=composite.getSize().y; *************** *** 64,70 **** } ! protected void createContents(Composite parent){ ! ! } public void setLayoutData(Object layoutData){ --- 55,59 ---- } ! abstract protected Composite createContents(Composite parent); public void setLayoutData(Object layoutData){ --- NEW FILE: DeleteConfirmDialog.java --- /** * */ package org.jcommander.ui.filepanel.dialogs; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.Shell; import org.jcommander.ui.filepanel.FilePanelPlugin; /** * @author MatthiasK * */ public class DeleteConfirmDialog extends DetailsDialog { private List deleteFileList; private Button moveToRecycleButton = null; private Label trashLabel = null; private boolean moveToRecycle; private String[] names; public DeleteConfirmDialog(Shell parentShell) { super(parentShell, "Delete Files"); // TODO Auto-generated constructor stub } /* (non-Javadoc) * @see org.jcommander.ui.filepanel.dialogs.DetailsDialog#createDropDownDialogArea(org.eclipse.swt.widgets.Composite) */ protected Composite createDropDownDialogArea(Composite parent) { Composite trashComposite = new Composite(parent, SWT.BORDER); GridLayout trashLayout = new GridLayout(); trashLayout.numColumns=2; trashComposite.setLayout(trashLayout); trashComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); GridData trashLabelData = new GridData(); GridData moveToRecycleButtonData = new GridData(); trashLabelData.verticalAlignment=SWT.CENTER; moveToRecycleButtonData.verticalAlignment=SWT.CENTER; trashLabel = new Label(trashComposite, SWT.NONE); trashLabel.setText(""); ImageDescriptor imgDesc = FilePanelPlugin.imageDescriptorFromPlugin(FilePanelPlugin.ID, "icons/trash.gif"); Image trashImg = imgDesc.createImage(getShell().getDisplay()); trashLabel.setImage(trashImg); trashLabel.setLayoutData(trashLabelData); moveToRecycleButton = new Button(trashComposite, SWT.CHECK); if(Platform.getOS().equals(Platform.OS_WIN32)) { moveToRecycleButton.setText("&Move to the recycle bin"); moveToRecycleButton.setToolTipText("Moved deleted files to the recycle bin"); } else { moveToRecycleButton.setText("&Move to the trash"); moveToRecycleButton.setToolTipText("Moved deleted files to the trash"); } moveToRecycleButton.setSelection(moveToRecycle); moveToRecycleButton. addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { try { IPreferenceStore store = FilePanelPlugin.getDefault().getPreferenceStore(); store.setValue(FilePanelPlugin.MOVE_TO_RECYCLE_KEY,((Button) e.getSource()).getSelection()); } catch(Exception ex) { //ignore } } }); moveToRecycleButton.setLayoutData(moveToRecycleButtonData); return trashComposite; } /* (non-Javadoc) * @see org.jcommander.ui.filepanel.dialogs.DetailsDialog#createMainDialogArea(org.eclipse.swt.widgets.Composite) */ protected void createMainDialogArea(Composite parent) { GridLayout infoCompositeLayout = new GridLayout(); infoCompositeLayout.numColumns = 1; GridData infoCompositeData = new GridData(); GridData labelData = new GridData(); Label label = new Label(parent, SWT.NONE); Composite infoComposite = new Composite(parent, SWT.NONE); //gridData1.horizontalAlignment = org.eclipse.swt.layout.GridData.CENTER; labelData.grabExcessHorizontalSpace = true; labelData.grabExcessVerticalSpace = true; label.setText("Delete selected files?"); label.setLayoutData(labelData); //createListComposite(parent); GridData listCompositeData = new GridData(); listCompositeData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; listCompositeData.grabExcessHorizontalSpace = true; listCompositeData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL; listCompositeData.grabExcessVerticalSpace = true; GridData deleteListData = new GridData(); GridData gridData2 = new GridData(); deleteListData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; deleteListData.grabExcessHorizontalSpace = true; deleteListData.verticalAlignment = org.eclipse.swt.layout.GridData.FILL; deleteListData.grabExcessVerticalSpace = true; deleteListData.heightHint=60; deleteListData.minimumWidth=400; gridData2.horizontalAlignment = org.eclipse.swt.layout.GridData.END; gridData2.verticalAlignment = org.eclipse.swt.layout.GridData.BEGINNING; GridLayout gridLayout = new GridLayout(); gridLayout.numColumns = 1; gridLayout.marginWidth=0; Composite listComposite = new Composite(infoComposite, SWT.NONE); listComposite.setLayoutData(listCompositeData); listComposite.setLayout(gridLayout); deleteFileList = new List(listComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); deleteFileList.setLayoutData(deleteListData); moveToRecycle = ((FilePanelPlugin.getDefault().getPreferenceStore()). getBoolean(FilePanelPlugin.MOVE_TO_RECYCLE_KEY)); infoCompositeData.horizontalAlignment = org.eclipse.swt.layout.GridData.FILL; infoCompositeData.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER; infoCompositeData.grabExcessHorizontalSpace = true; infoCompositeData.grabExcessVerticalSpace = true; infoCompositeLayout.marginWidth=0; infoComposite.setLayoutData(infoCompositeData); infoComposite.setLayout(infoCompositeLayout); } /* (non-Javadoc) * @see org.jcommander.ui.filepanel.dialogs.DetailsDialog#updateEnablements() */ protected void updateEnablements() { // TODO Auto-generated method stub } public List getDeleteFileList() { return deleteFileList; } private void toggleEnableMoveToRecycle(boolean value) { if (moveToRecycleButton!=null) { moveToRecycleButton.setEnabled(value); } } private void setMoveToRecycle(boolean value) { IPreferenceStore store = FilePanelPlugin.getDefault().getPreferenceStore(); store.setValue(FilePanelPlugin.MOVE_TO_RECYCLE_KEY,value); if (moveToRecycleButton!=null) { moveToRecycleButton.setSelection(value); } } public void disableMoveToRecycle() { setMoveToRecycle(false); toggleEnableMoveToRecycle(false); } public boolean getMoveToRecycle() { return moveToRecycle; } protected boolean includeOkButton() { return false; } protected boolean includeCancelButton() { return false; } protected boolean includeNoButton() { return true; } protected boolean includeYesButton() { return true; } int getDefaultButtonID() { // TODO Auto-generated method stub return IDialogConstants.NO_ID; } public boolean close() { names = deleteFileList.getItems(); return super.close(); } public String[] getNames() { return names; } } |
|
From: Matthias K <mat...@us...> - 2006-04-26 16:39:24
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3053/src/org/jcommander/ui/filepanel/actions Modified Files: SimpleOpenURLAction.java Log Message: first part of migration to JFace dialogs Index: SimpleOpenURLAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/SimpleOpenURLAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SimpleOpenURLAction.java 24 Apr 2006 20:40:58 -0000 1.5 --- SimpleOpenURLAction.java 26 Apr 2006 16:39:19 -0000 1.6 *************** *** 8,11 **** --- 8,13 ---- import org.apache.commons.vfs.FileType; import org.eclipse.jface.action.IAction; + import org.eclipse.jface.action.Separator; + import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.TitleAreaDialog; *************** *** 127,132 **** * @see org.jcommander.ui.filepanel.dialogs.DisappearableComposite#createContents(org.eclipse.swt.widgets.Composite) */ ! protected void createContents(Composite parent) { ! messageText = new Text(parent,SWT.MULTI|SWT.V_SCROLL|SWT.BORDER|SWT.READ_ONLY); GridData messageTextData = new GridData(); messageTextData.grabExcessHorizontalSpace=true; --- 129,140 ---- * @see org.jcommander.ui.filepanel.dialogs.DisappearableComposite#createContents(org.eclipse.swt.widgets.Composite) */ ! protected Composite createContents(Composite parent) { ! Composite messageComp = new Composite(parent,SWT.NONE); ! GridLayout messageLayout = new GridLayout(); ! messageLayout.marginWidth=0; ! messageLayout.marginHeight=1; ! messageComp.setLayout(messageLayout); ! messageComp.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true)); ! messageText = new Text(messageComp,SWT.MULTI|SWT.V_SCROLL|SWT.BORDER|SWT.READ_ONLY); GridData messageTextData = new GridData(); messageTextData.grabExcessHorizontalSpace=true; *************** *** 135,139 **** messageTextData.verticalAlignment=SWT.FILL; messageTextData.minimumHeight=60; ! messageText.setLayoutData(messageTextData); } --- 143,148 ---- messageTextData.verticalAlignment=SWT.FILL; messageTextData.minimumHeight=60; ! messageText.setLayoutData(messageTextData); ! return messageComp; } *************** *** 146,149 **** --- 155,165 ---- messageArea.setLayoutData(messageData); + Label sep = new Label(parent,SWT.SEPARATOR | SWT.HORIZONTAL); + GridData labelData = new GridData(); + labelData.grabExcessHorizontalSpace=true; + labelData.horizontalAlignment=SWT.FILL; + labelData.verticalIndent=50; + sep.setLayoutData(labelData); + return dialogArea; } |
|
From: Matthias K <mat...@us...> - 2006-04-26 16:39:23
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3053/src/org/jcommander/ui/filepanel/performers Modified Files: FileCopyPerformer.java FileDeletePerformer.java Log Message: first part of migration to JFace dialogs Index: FileCopyPerformer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileCopyPerformer.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** FileCopyPerformer.java 17 Apr 2006 21:31:00 -0000 1.34 --- FileCopyPerformer.java 26 Apr 2006 16:39:19 -0000 1.35 *************** *** 31,42 **** public class FileCopyPerformer { protected TabMediator mediator; ! protected Shell confirmDialog; protected Shell progressDialog; ! protected CopyConfirmDialogComposite confirmDialogComposite; protected CopyProgressDialogComposite progressDialogComposite; ! protected static final int NO_OPTION = 0; ! protected static final int OK_OPTION = 1; ! protected static final int CANCEL_OPTION = 2; protected int selectedOption; --- 31,43 ---- public class FileCopyPerformer { protected TabMediator mediator; ! //protected Shell confirmDialog; ! protected CopyConfirmDialog confirmDialog; protected Shell progressDialog; ! //protected CopyConfirmDialogComposite confirmDialogComposite; protected CopyProgressDialogComposite progressDialogComposite; ! //protected static final int NO_OPTION = 0; ! //protected static final int OK_OPTION = 1; ! //protected static final int CANCEL_OPTION = 2; protected int selectedOption; *************** *** 118,122 **** }); ! waitForUserChoice(); } --- 119,123 ---- }); ! //waitForUserChoice(); } *************** *** 209,213 **** files = predefinedSourceFiles; } ! String[] names = confirmDialogComposite.getSelectionList().getItems(); Vector buffer = new Vector(); if(names != null) { --- 210,214 ---- files = predefinedSourceFiles; } ! String[] names = confirmDialog.getNames(); Vector buffer = new Vector(); if(names != null) { *************** *** 222,225 **** --- 223,227 ---- for(int i = 0; i < buffer.size(); i++) sourceFiles[i] = (FileObject)buffer.get(i); + selectedOption = confirmDialog.getReturnCode(); } }); *************** *** 227,240 **** sourceFiles = mediator.getFileTab().getActiveFilePanel().getFileControl().getSelectedFiles(); ! selectedOption = OK_OPTION; } ! if(selectedOption == OK_OPTION) { // Display copy progress dialog EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! if(confirmDialog != null && !confirmDialog.isDisposed()) { ! confirmDialog.setVisible(false); ! } showProgressDialog(); --- 229,242 ---- sourceFiles = mediator.getFileTab().getActiveFilePanel().getFileControl().getSelectedFiles(); ! selectedOption = IDialogConstants.OK_ID; } ! if(selectedOption == IDialogConstants.OK_ID) { // Display copy progress dialog EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { ! // if(confirmDialog != null && !confirmDialog.isDisposed()) { ! // confirmDialog.setVisible(false); ! // } showProgressDialog(); *************** *** 253,265 **** performCopy(); ! }else { ! EclipseBroker.getDisplay().syncExec(new Runnable() { ! public void run() { ! if(confirmDialog != null && !confirmDialog.isDisposed()) { ! confirmDialog.setVisible(false); ! } ! } ! }); ! } } --- 255,267 ---- performCopy(); ! }//else { ! // EclipseBroker.getDisplay().syncExec(new Runnable() { ! // public void run() { ! // if(confirmDialog != null && !confirmDialog.isDisposed()) { ! // confirmDialog.setVisible(false); ! // } ! // } ! // }); ! // } } *************** *** 456,472 **** Shell shell = EclipseBroker.getShell(); ! final SelectionAdapter cancelButtonSelectionAdapter = new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! resumeOperationThread = true; ! selectedOption = CANCEL_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! } ! } ! }; ! confirmDialog = Utils.createOperationDialog(shell, mediator); ! confirmDialogComposite = new CopyConfirmDialogComposite(confirmDialog, SWT.NONE); FileObject[] sourceFiles = null; --- 458,464 ---- Shell shell = EclipseBroker.getShell(); ! confirmDialog = new CopyConfirmDialog(shell); ! confirmDialog.create(); FileObject[] sourceFiles = null; *************** *** 480,484 **** } ! List copyList = confirmDialogComposite.getSelectionList(); for(int i=0;i<sourceFiles.length;i++) { --- 472,476 ---- } ! List copyList = confirmDialog.getSelectionList(); for(int i=0;i<sourceFiles.length;i++) { *************** *** 486,513 **** } ! confirmDialog.setDefaultButton(confirmDialogComposite.getOkButton()); ! confirmDialog.addShellListener(new ShellAdapter() { ! public void shellClosed(ShellEvent e) { ! cancelButtonSelectionAdapter.widgetSelected(null); ! } ! }); ! ! confirmDialogComposite.getOkButton().addSelectionListener(new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! keepSelected = confirmDialogComposite.isKeptSelected(); ! resumeOperationThread = true; ! selectedOption = OK_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! } ! } ! }); ! ! confirmDialogComposite.selectDeleteCheckBox(deleteSourceFiles); ! ! confirmDialogComposite.getCancelButton().addSelectionListener(cancelButtonSelectionAdapter); ! ! Utils.accomodateComposite(confirmDialogComposite); FilePanel targetPanel = null; --- 478,482 ---- } ! confirmDialog.selectDeleteCheckBox(deleteSourceFiles); FilePanel targetPanel = null; *************** *** 524,543 **** .getCurrentParent(); ! //confirmDialogComposite.getCopyTarget().setText(targetDir.getName().getRootURI() + targetDir.getName().getPath()); ! confirmDialogComposite.setCopyTarget(VfsManagerExtension.getDisplayablePath(targetDir));//targetDir.getName().getRootURI() + targetDir.getName().getPath()); if(predefinedSourceFiles != null) { ! confirmDialogComposite.getKeepSelectedCheckBox().setEnabled(false); ! confirmDialogComposite.getDeleteCheckBox().setEnabled(false); } if (deleteSourceFiles) { ! confirmDialog.setText("Confirm Move Operation"); } ! else confirmDialog.setText("Confirm Copy Operation"); ! WindowUtils.pack(confirmDialog); ! WindowUtils.centerRelativeTo(confirmDialog, shell); ! confirmDialog.setVisible(true); ! confirmDialog.setActive(); } --- 493,512 ---- .getCurrentParent(); ! confirmDialog.setCopyTarget(VfsManagerExtension.getDisplayablePath(targetDir));//targetDir.getName().getRootURI() + targetDir.getName().getPath()); if(predefinedSourceFiles != null) { ! confirmDialog.getKeepSelectedCheckBox().setEnabled(false); ! confirmDialog.getDeleteCheckBox().setEnabled(false); } if (deleteSourceFiles) { ! confirmDialog.getShell().setText("Confirm Move Operation"); } ! else confirmDialog.getShell().setText("Confirm Copy Operation"); ! //WindowUtils.pack(confirmDialog); ! //WindowUtils.centerRelativeTo(confirmDialog, shell); ! //confirmDialog.setVisible(true); ! //confirmDialog.setActive(); ! confirmDialog.open(); } Index: FileDeletePerformer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/FileDeletePerformer.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** FileDeletePerformer.java 17 Apr 2006 14:53:59 -0000 1.17 --- FileDeletePerformer.java 26 Apr 2006 16:39:19 -0000 1.18 *************** *** 8,12 **** import org.apache.commons.vfs.*; import org.apache.commons.vfs.provider.local.LocalFile; ! import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.*; import org.eclipse.swt.events.*; --- 8,12 ---- import org.apache.commons.vfs.*; import org.apache.commons.vfs.provider.local.LocalFile; ! import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.*; import org.eclipse.swt.events.*; *************** *** 32,40 **** protected Shell progressDialog; protected DeleteConfirmDialogComposite confirmDialogComposite; protected DeleteProgressDialogComposite progressDialogComposite; ! protected static final int NO_OPTION = 0; ! protected static final int OK_OPTION = 1; ! protected static final int CANCEL_OPTION = 2; protected int selectedOption; --- 32,41 ---- protected Shell progressDialog; protected DeleteConfirmDialogComposite confirmDialogComposite; + protected DeleteConfirmDialog dialog; protected DeleteProgressDialogComposite progressDialogComposite; ! // protected static final int NO_OPTION = 0; ! // protected static final int OK_OPTION = 1; ! // protected static final int CANCEL_OPTION = 2; protected int selectedOption; *************** *** 42,46 **** protected boolean resumeOperationThread; protected Thread operationThread; ! private Object workerLock = new Object(); protected int totalFiles; --- 43,47 ---- protected boolean resumeOperationThread; protected Thread operationThread; ! //private Object workerLock = new Object(); protected int totalFiles; *************** *** 89,93 **** }); ! waitForUserChoice(); EclipseBroker.getDisplay().syncExec(new Runnable() { --- 90,94 ---- }); ! //waitForUserChoice(); EclipseBroker.getDisplay().syncExec(new Runnable() { *************** *** 96,100 **** .getFileControl() .getSelectedFiles(); ! String[] names = confirmDialogComposite.getDeleteFileList().getItems(); Vector buffer = new Vector(); if(names != null) { --- 97,101 ---- .getFileControl() .getSelectedFiles(); ! String[] names = dialog.getNames(); Vector buffer = new Vector(); if(names != null) { *************** *** 112,121 **** }); ! if(selectedOption == OK_OPTION) { // Display delete progress dialog EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { - confirmDialog.setVisible(false); - showProgressDialog(); } --- 113,120 ---- }); ! if(dialog.getReturnCode()==IDialogConstants.YES_ID) { // Display delete progress dialog EclipseBroker.getDisplay().syncExec(new Runnable() { public void run() { showProgressDialog(); } *************** *** 130,141 **** } }); - }else { - EclipseBroker.getDisplay().syncExec(new Runnable() { - public void run() { - if(!confirmDialog.isDisposed()) { - confirmDialog.setVisible(false); - } - } - }); } } --- 129,132 ---- *************** *** 258,275 **** } ! /** ! * ! */ ! protected void waitForUserChoice() { ! resumeOperationThread = false; ! ! while(!resumeOperationThread) { ! synchronized (workerLock) { ! try { ! workerLock.wait(); ! }catch(InterruptedException ex) {} ! } ! } ! } /** --- 249,266 ---- } ! // /** ! // * ! // */ ! // protected void waitForUserChoice() { ! // resumeOperationThread = false; ! // ! // while(!resumeOperationThread) { ! // synchronized (workerLock) { ! // try { ! // workerLock.wait(); ! // }catch(InterruptedException ex) {} ! // } ! // } ! // } /** *************** *** 277,336 **** */ protected void showConfirmDialog() { Shell shell = EclipseBroker.getShell(); ! final SelectionAdapter cancelButtonSelectionAdapter = new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! resumeOperationThread = true; ! selectedOption = CANCEL_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! } ! } ! }; ! confirmDialog = Utils.createOperationDialog(shell, mediator); ! confirmDialog.setText("Delete files"); ! confirmDialogComposite = new DeleteConfirmDialogComposite(confirmDialog, SWT.NONE); FileObject[] sourceFiles = sourcePanel ! .getFileControl() ! .getSelectedFiles(); ! List deleteFilesList = confirmDialogComposite.getDeleteFileList(); ! for(int i=0;i<sourceFiles.length;i++) { deleteFilesList.add(sourceFiles[i].getName().getBaseName()); if(moveToRecycle && !(sourceFiles[i] instanceof LocalFile)) { moveToRecycle = false; ! confirmDialogComposite.disableMoveToRecycle(); } } ! confirmDialog.setDefaultButton(confirmDialogComposite.getNoButton()); ! confirmDialog.addShellListener(new ShellAdapter() { ! public void shellClosed(ShellEvent e) { ! cancelButtonSelectionAdapter.widgetSelected(null); ! } ! }); ! ! confirmDialogComposite.getYesButton().addSelectionListener(new SelectionAdapter() { ! public void widgetSelected(SelectionEvent e) { ! resumeOperationThread = true; ! selectedOption = OK_OPTION; ! ! synchronized (workerLock) { ! workerLock.notifyAll(); ! } ! } ! }); ! ! confirmDialogComposite.getNoButton().addSelectionListener(cancelButtonSelectionAdapter); ! Utils.accomodateComposite(confirmDialogComposite); ! WindowUtils.pack(confirmDialog); ! WindowUtils.centerRelativeTo(confirmDialog, shell); ! confirmDialog.setVisible(true); ! confirmDialog.setActive(); } } --- 268,353 ---- */ protected void showConfirmDialog() { + Shell shell = EclipseBroker.getShell(); ! dialog = new DeleteConfirmDialog(shell); ! dialog.create(); FileObject[] sourceFiles = sourcePanel ! .getFileControl() ! .getSelectedFiles(); ! List deleteFilesList = dialog.getDeleteFileList(); ! for(int i=0;i<sourceFiles.length;i++) { deleteFilesList.add(sourceFiles[i].getName().getBaseName()); if(moveToRecycle && !(sourceFiles[i] instanceof LocalFile)) { moveToRecycle = false; ! dialog.disableMoveToRecycle(); } } ! dialog.open(); ! //dialog.getr ! // /////////////// ! // ! // Shell shell = EclipseBroker.getShell(); ! // ! // final SelectionAdapter cancelButtonSelectionAdapter = new SelectionAdapter() { ! // public void widgetSelected(SelectionEvent e) { ! // resumeOperationThread = true; ! // selectedOption = CANCEL_OPTION; ! // ! // synchronized (workerLock) { ! // workerLock.notifyAll(); ! // } ! // } ! // }; ! // ! // confirmDialog = Utils.createOperationDialog(shell, mediator); ! // confirmDialog.setText("Delete files"); ! // confirmDialogComposite = new DeleteConfirmDialogComposite(confirmDialog, SWT.NONE); ! // ! // FileObject[] sourceFiles = sourcePanel ! // .getFileControl() ! // .getSelectedFiles(); ! // List deleteFilesList = confirmDialogComposite.getDeleteFileList(); ! // ! // for(int i=0;i<sourceFiles.length;i++) { ! // deleteFilesList.add(sourceFiles[i].getName().getBaseName()); ! // if(moveToRecycle && !(sourceFiles[i] instanceof LocalFile)) { ! // moveToRecycle = false; ! // confirmDialogComposite.disableMoveToRecycle(); ! // } ! // } ! // ! // confirmDialog.setDefaultButton(confirmDialogComposite.getNoButton()); ! // confirmDialog.addShellListener(new ShellAdapter() { ! // public void shellClosed(ShellEvent e) { ! // cancelButtonSelectionAdapter.widgetSelected(null); ! // } ! // }); ! // ! // confirmDialogComposite.getYesButton().addSelectionListener(new SelectionAdapter() { ! // public void widgetSelected(SelectionEvent e) { ! // resumeOperationThread = true; ! // selectedOption = OK_OPTION; ! // ! // synchronized (workerLock) { ! // workerLock.notifyAll(); ! // } ! // } ! // }); ! // ! // confirmDialogComposite.getNoButton().addSelectionListener(cancelButtonSelectionAdapter); ! // ! // Utils.accomodateComposite(confirmDialogComposite); ! // ! // WindowUtils.pack(confirmDialog); ! // WindowUtils.centerRelativeTo(confirmDialog, shell); ! // confirmDialog.setVisible(true); ! // confirmDialog.setActive(); } } |
|
From: Robert E. <sky...@us...> - 2006-04-26 11:09:18
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4358/src/org/jcommander/ui/app Modified Files: JCmdWorkbenchAdvisor.java Log Message: Partial fix for bug report [ 1475431 ] Multi-Screens not really supported Index: JCmdWorkbenchAdvisor.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/JCmdWorkbenchAdvisor.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** JCmdWorkbenchAdvisor.java 20 Mar 2006 05:49:34 -0000 1.35 --- JCmdWorkbenchAdvisor.java 26 Apr 2006 11:09:10 -0000 1.36 *************** *** 87,92 **** configurer.setTitle(actualCaption); ! Shell appShell = configurer.getWindow().getShell(); ! WindowUtils.centerRelativeTo(appShell, appShell.getDisplay()); } --- 87,93 ---- configurer.setTitle(actualCaption); ! /* Let the Eclipse runtime handle the positioning and sizing */ ! // Shell appShell = configurer.getWindow().getShell(); ! // WindowUtils.centerRelativeTo(appShell, appShell.getDisplay()); } |
|
From: Robert E. <sky...@us...> - 2006-04-25 20:09:51
|
Update of /cvsroot/jcommander/devdocs/checkout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31432/checkout Modified Files: jcmdProjectSet-ssh.psf jcmdProjectSet-anonymous.psf Log Message: Updated for the recently extended plugin set Index: jcmdProjectSet-anonymous.psf =================================================================== RCS file: /cvsroot/jcommander/devdocs/checkout/jcmdProjectSet-anonymous.psf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jcmdProjectSet-anonymous.psf 2 Mar 2006 09:24:41 -0000 1.3 --- jcmdProjectSet-anonymous.psf 25 Apr 2006 20:09:44 -0000 1.4 *************** *** 2,37 **** <psf version="2.0"> <provider id="org.eclipse.team.cvs.core.cvsnature"> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.tools.nativemanager.ui,org.jcommander.tools.nativemanager.ui"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.apache.commons.vfs,org.apache.commons.vfs"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.apache.commons.vfs.dependencies,org.apache.commons.vfs.dependencies"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.apache.log4j,org.apache.log4j"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander,org.jcommander"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.eclipseplatform,org.jcommander.eclipseplatform"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,incubator/org.jcommander.phileas.totalcmd,org.jcommander.phileas.totalcmd"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.systemshell,org.jcommander.systemshell"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.systemshell.win32,org.jcommander.systemshell.win32"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.tools.nativemanager,org.jcommander.tools.nativemanager"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.update,org.jcommander.update"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.updatesite,org.jcommander.updatesite"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.vfsextensions,org.jcommander.vfsextensions"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.phileas.bookmarks,org.jcommander.phileas.bookmarks"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.phileas.platformutils,org.jcommander.phileas.platformutils"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.phileas.utils,org.jcommander.phileas.utils"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui,org.jcommander.ui"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.app,org.jcommander.ui.app"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.app.iconpack.eclipse,org.jcommander.ui.app.iconpack.eclipse"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.externaltools,org.jcommander.ui.externaltools"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.editor,org.jcommander.ui.editor"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.editor.iconpack.eclipse,org.jcommander.ui.editor.iconpack.eclipse"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.filepanel,org.jcommander.ui.filepanel"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.filepanel.iconpack.eclipse,org.jcommander.ui.filepanel.iconpack.eclipse"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.fileviewer,org.jcommander.ui.fileviewer"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.findfiles,org.jcommander.ui.findfiles"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.findfiles.iconpack.eclipse,org.jcommander.ui.findfiles.iconpack.eclipse"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.help,org.jcommander.ui.help"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.iconpack.eclipse,org.jcommander.ui.iconpack.eclipse"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.intro,org.jcommander.ui.intro"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.logger,org.jcommander.ui.logger"/> ! <project reference="1.0,:pserver:ano...@cv...:/cvsroot/jcommander,plugins/org.jcommander.ui.utils,org.jcommander.ui.utils"/> </provider> </psf> --- 2,41 ---- <psf version="2.0"> <provider id="org.eclipse.team.cvs.core.cvsnature"> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.apache.commons.vfs,org.apache.commons.vfs"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.apache.commons.vfs.dependencies,org.apache.commons.vfs.dependencies"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.apache.log4j,org.apache.log4j"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander,org.jcommander"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.commons,org.jcommander.commons"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.eclipsepatch.compare,org.jcommander.eclipsepatch.compare"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.eclipsepatch.progressview,org.jcommander.eclipsepatch.progressview"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.eclipseplatform,org.jcommander.eclipseplatform"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.phileas.bookmarks,org.jcommander.phileas.bookmarks"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.phileas.logger,org.jcommander.phileas.logger"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.phileas.platformutils,org.jcommander.phileas.platformutils"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.phileas.utils,org.jcommander.phileas.utils"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.systemshell,org.jcommander.systemshell"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.systemshell.win32,org.jcommander.systemshell.win32"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.tools.nativemanager,org.jcommander.tools.nativemanager"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.tools.nativemanager.ui,org.jcommander.tools.nativemanager.ui"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui,org.jcommander.ui"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.app,org.jcommander.ui.app"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.app.iconpack.eclipse,org.jcommander.ui.app.iconpack.eclipse"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.compare,org.jcommander.ui.compare"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.editor,org.jcommander.ui.editor"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.editor.iconpack.eclipse,org.jcommander.ui.editor.iconpack.eclipse"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.externaltools,org.jcommander.ui.externaltools"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.filepanel,org.jcommander.ui.filepanel"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.filepanel.iconpack.eclipse,org.jcommander.ui.filepanel.iconpack.eclipse"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.fileviewer,org.jcommander.ui.fileviewer"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.findfiles,org.jcommander.ui.findfiles"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.findfiles.iconpack.eclipse,org.jcommander.ui.findfiles.iconpack.eclipse"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.help,org.jcommander.ui.help"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.iconpack.eclipse,org.jcommander.ui.iconpack.eclipse"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.intro,org.jcommander.ui.intro"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.logger,org.jcommander.ui.logger"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.utils,org.jcommander.ui.utils"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.update,org.jcommander.update"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.updatesite,org.jcommander.updatesite"/> ! <project reference="1.0,:pserver:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.vfsextensions,org.jcommander.vfsextensions"/> </provider> </psf> Index: jcmdProjectSet-ssh.psf =================================================================== RCS file: /cvsroot/jcommander/devdocs/checkout/jcmdProjectSet-ssh.psf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jcmdProjectSet-ssh.psf 2 Mar 2006 09:24:39 -0000 1.3 --- jcmdProjectSet-ssh.psf 25 Apr 2006 20:09:44 -0000 1.4 *************** *** 6,13 **** <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.apache.log4j,org.apache.log4j"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander,org.jcommander"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.eclipseplatform,org.jcommander.eclipseplatform"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.phileas.bookmarks,org.jcommander.phileas.bookmarks"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.phileas.platformutils,org.jcommander.phileas.platformutils"/> - <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,incubator/org.jcommander.phileas.totalcmd,org.jcommander.phileas.totalcmd"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.phileas.utils,org.jcommander.phileas.utils"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.systemshell,org.jcommander.systemshell"/> --- 6,16 ---- <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.apache.log4j,org.apache.log4j"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander,org.jcommander"/> + <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.commons,org.jcommander.commons"/> + <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.eclipsepatch.compare,org.jcommander.eclipsepatch.compare"/> + <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.eclipsepatch.progressview,org.jcommander.eclipsepatch.progressview"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.eclipseplatform,org.jcommander.eclipseplatform"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.phileas.bookmarks,org.jcommander.phileas.bookmarks"/> + <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.phileas.logger,org.jcommander.phileas.logger"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.phileas.platformutils,org.jcommander.phileas.platformutils"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.phileas.utils,org.jcommander.phileas.utils"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.systemshell,org.jcommander.systemshell"/> *************** *** 18,24 **** <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.app,org.jcommander.ui.app"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.app.iconpack.eclipse,org.jcommander.ui.app.iconpack.eclipse"/> ! <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.externaltools,org.jcommander.ui.externaltools"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.editor,org.jcommander.ui.editor"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.editor.iconpack.eclipse,org.jcommander.ui.editor.iconpack.eclipse"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.filepanel,org.jcommander.ui.filepanel"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.filepanel.iconpack.eclipse,org.jcommander.ui.filepanel.iconpack.eclipse"/> --- 21,28 ---- <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.app,org.jcommander.ui.app"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.app.iconpack.eclipse,org.jcommander.ui.app.iconpack.eclipse"/> ! <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.compare,org.jcommander.ui.compare"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.editor,org.jcommander.ui.editor"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.editor.iconpack.eclipse,org.jcommander.ui.editor.iconpack.eclipse"/> + <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.externaltools,org.jcommander.ui.externaltools"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.filepanel,org.jcommander.ui.filepanel"/> <project reference="1.0,:extssh:cvs.sourceforge.net:/cvsroot/jcommander,plugins/org.jcommander.ui.filepanel.iconpack.eclipse,org.jcommander.ui.filepanel.iconpack.eclipse"/> |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:56:04
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.logger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14790 Modified Files: build.properties Log Message: Added log4j.xml to the binary package Index: build.properties =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.logger/build.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.properties 27 Feb 2005 20:32:21 -0000 1.1 --- build.properties 25 Apr 2006 09:55:57 -0000 1.2 *************** *** 2,4 **** output.jcmd-logger.jar = bin/ bin.includes = plugin.xml,\ ! jcmd-logger.jar --- 2,5 ---- output.jcmd-logger.jar = bin/ bin.includes = plugin.xml,\ ! jcmd-logger.jar,\ ! log4j.xml |
