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-04-25 09:28:13
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25604/src/org/jcommander/ui/app/config Modified Files: Configuration.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: Configuration.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/src/org/jcommander/ui/app/config/Configuration.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Configuration.java 5 Apr 2006 20:35:16 -0000 1.14 --- Configuration.java 25 Apr 2006 09:28:09 -0000 1.15 *************** *** 30,34 **** protected List tabs = new ArrayList(); ! Logger logger = Logger.getLogger(Configuration.class); protected ConfigurationPanel defaultLeftpanel; --- 30,34 ---- protected List tabs = new ArrayList(); ! protected Logger logger = Logger.getLogger(getClass()); protected ConfigurationPanel defaultLeftpanel; *************** *** 96,100 **** MessageDisplayer .displayMessage("Unable to save configuration file!"); ! e.printStackTrace(); } } --- 96,100 ---- MessageDisplayer .displayMessage("Unable to save configuration file!"); ! logger.error(e,e); } } |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:28:13
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25604 Modified Files: plugin_customization.ini Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: plugin_customization.ini =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.app/plugin_customization.ini,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** plugin_customization.ini 5 Apr 2006 20:42:03 -0000 1.8 --- plugin_customization.ini 25 Apr 2006 09:28:09 -0000 1.9 *************** *** 16,19 **** --- 16,22 ---- org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true + # enabled the Extended VS Presentation + org.eclipse.ui/presentationFactoryId=de.loskutov.EclipseSkins.extvs.EVSPresentationFactory + # KeepResident settings edu.stanford.suif.keepresident/maxPreference=62242048 *************** *** 25,27 **** #open perspectives in new windows ! #org.eclipse.ui.workbench/OPEN_PERSPECTIVE_MODE=2 \ No newline at end of file --- 28,43 ---- #open perspectives in new windows ! #org.eclipse.ui.workbench/OPEN_PERSPECTIVE_MODE=2 ! ! # Extended VS Presentation defaults ! de.loskutov.eclipseskins.extvs/de.loskutov.EclipseSkins.showEditorIcon=true ! de.loskutov.eclipseskins.extvs/de.loskutov.EclipseSkins.showViewIcon=true ! de.loskutov.eclipseskins.extvs/de.loskutov.EclipseSkins.tabPaddingY=0 ! de.loskutov.eclipseskins.extvs/de.loskutov.EclipseSkins.tabPaddingX=5 ! de.loskutov.eclipseskins.extvs/de.loskutov.EclipseSkins.border.size=0 ! de.loskutov.eclipseskins.extvs/de.loskutov.EclipseSkins.moveTabAmount=15 ! de.loskutov.eclipseskins.extvs/de.loskutov.EclipseSkins.showFileExtensions=false ! de.loskutov.eclipseskins.extvs/de.loskutov.EclipseSkins.useMaxTabsWidth=true ! de.loskutov.eclipseskins.extvs/de.loskutov.EclipseSkins.useFastTabSwitch=true ! de.loskutov.eclipseskins.extvs/de.loskutov.EclipseSkins.maxTabsWidth=15 ! de.loskutov.eclipseskins.extvs/de.loskutov.EclipseSkins.cropIndTheMiddle=false \ No newline at end of file |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:28:11
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.musicplayer/META-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25466/META-INF Modified Files: MANIFEST.MF Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.musicplayer/META-INF/MANIFEST.MF,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MANIFEST.MF 20 Mar 2006 21:49:01 -0000 1.3 --- MANIFEST.MF 25 Apr 2006 09:28:05 -0000 1.4 *************** *** 11,14 **** org.apache.commons.vfs, org.apache.commons.vfs.dependencies, ! org.jcommander.vfsextensions Eclipse-AutoStart: true --- 11,15 ---- org.apache.commons.vfs, org.apache.commons.vfs.dependencies, ! org.jcommander.vfsextensions, ! org.apache.log4j Eclipse-AutoStart: true |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:28:11
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.musicplayer/src/org/jcommander/ui/musicplayer/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25466/src/org/jcommander/ui/musicplayer/views Modified Files: MusicPlayerView.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: MusicPlayerView.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.musicplayer/src/org/jcommander/ui/musicplayer/views/MusicPlayerView.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MusicPlayerView.java 20 Mar 2006 21:49:01 -0000 1.7 --- MusicPlayerView.java 25 Apr 2006 09:28:05 -0000 1.8 *************** *** 14,17 **** --- 14,18 ---- import org.apache.commons.vfs.FileObject; import org.apache.commons.vfs.FileSystemException; + import org.apache.log4j.Logger; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.SWT; *************** *** 21,24 **** --- 22,28 ---- public class MusicPlayerView extends ViewPart { + + protected Logger logger = Logger.getLogger(getClass()); + public static final String ID = "org.jcommander.ui.musicplayer.views.MusicPlayerView"; *************** *** 79,93 **** } } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } catch (UnsupportedAudioFileException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } catch (IOException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } catch (LineUnavailableException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 83,93 ---- } } catch (FileSystemException e) { ! logger.error(e,e); } catch (UnsupportedAudioFileException e) { ! logger.error(e,e); } catch (IOException e) { ! logger.error(e,e); } catch (LineUnavailableException e) { ! logger.error(e,e); } } *************** *** 123,128 **** } } catch (InterruptedException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 123,127 ---- } } catch (InterruptedException e) { ! logger.error(e,e); } } |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:28:06
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/bookmarks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25171/src/org/jcommander/ui/filepanel/bookmarks Modified Files: BookmarkComposite.java BookmarksRootBookmark.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: BookmarksRootBookmark.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/bookmarks/BookmarksRootBookmark.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** BookmarksRootBookmark.java 21 Nov 2005 20:41:06 -0000 1.7 --- BookmarksRootBookmark.java 25 Apr 2006 09:27:58 -0000 1.8 *************** *** 9,12 **** --- 9,13 ---- import org.apache.commons.vfs.*; import org.apache.commons.vfs.impl.*; + import org.apache.log4j.Logger; import org.eclipse.core.runtime.*; import org.jcommander.phileas.bookmarks.*; *************** *** 22,25 **** --- 23,28 ---- public class BookmarksRootBookmark extends Bookmark { + protected static Logger logger = Logger.getLogger(BookmarksRootBookmark.class); + private static final String JCMDBMK_DEFAULT = "/res/jcommander.jcmdbmk.default"; *************** *** 41,46 **** manager.addMimeTypeMap("application/"+BookmarksFileSystem.JCMD_BMK_SCHEME, BookmarksFileSystem.JCMD_BMK_SCHEME); } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 44,48 ---- manager.addMimeTypeMap("application/"+BookmarksFileSystem.JCMD_BMK_SCHEME, BookmarksFileSystem.JCMD_BMK_SCHEME); } catch (FileSystemException e) { ! logger.error(e,e); } } *************** *** 75,80 **** } catch (IOException ex) { ! // TODO Auto-generated catch block ! ex.printStackTrace(); } --- 77,81 ---- } catch (IOException ex) { ! logger.error(ex,ex); } Index: BookmarkComposite.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/bookmarks/BookmarkComposite.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** BookmarkComposite.java 30 Dec 2005 14:50:55 -0000 1.20 --- BookmarkComposite.java 25 Apr 2006 09:27:58 -0000 1.21 *************** *** 8,11 **** --- 8,12 ---- import org.apache.commons.vfs.*; + import org.apache.log4j.Logger; import org.eclipse.jface.dialogs.*; import org.eclipse.swt.*; *************** *** 25,28 **** --- 26,32 ---- public class BookmarkComposite extends Composite { + + Logger logger = Logger.getLogger(getClass()); + protected static final String ADD_CURRENT_DIRECTORY_MENU_ENTRY = "Add current directory"; protected static final String EXPAND_MENU_ENTRY = "Expand"; *************** *** 92,97 **** bookmarkPanel.updateBookmarks(bookmarkPanel.getRootBookmark()); } catch (FileSystemException e1) { ! // TODO Auto-generated catch block ! e1.printStackTrace(); } } --- 96,100 ---- bookmarkPanel.updateBookmarks(bookmarkPanel.getRootBookmark()); } catch (FileSystemException e1) { ! logger.error(e1); } } *************** *** 182,186 **** public void handleEvent(Event event) { ! System.out.println("!!!!!mouse button pressed"); } --- 185,189 ---- public void handleEvent(Event event) { ! logger.debug("!!!!!mouse button pressed"); } |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:28:06
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/comparators In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25171/src/org/jcommander/ui/filepanel/comparators Modified Files: TableComparator.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: TableComparator.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/comparators/TableComparator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TableComparator.java 16 Mar 2006 18:21:19 -0000 1.4 --- TableComparator.java 25 Apr 2006 09:27:58 -0000 1.5 *************** *** 5,12 **** --- 5,16 ---- import org.apache.commons.vfs.FileSystemException; import org.apache.commons.vfs.FileType; + import org.apache.log4j.Logger; import org.jcommander.ui.filepanel.model.FileControlModel; import org.jcommander.ui.filepanel.model.FileDetails; public class TableComparator implements Comparator { + + protected Logger logger = Logger.getLogger(getClass()); + private int sortingField; private int order; *************** *** 98,103 **** } catch(Exception ex) { ! ex.printStackTrace(); ! return 0; } } --- 102,107 ---- } catch(Exception ex) { ! logger.error(ex); ! return 0; } } |
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.musicplayer.contribution/src/org/jcommander/ui/musicplayer/contribution/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25277/src/org/jcommander/ui/musicplayer/contribution/actions Modified Files: ShowPlayer.java AddSelectionToPlaylist.java AddAndPlaySelected.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: AddSelectionToPlaylist.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.musicplayer.contribution/src/org/jcommander/ui/musicplayer/contribution/actions/AddSelectionToPlaylist.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AddSelectionToPlaylist.java 8 Mar 2006 08:41:16 -0000 1.1 --- AddSelectionToPlaylist.java 25 Apr 2006 09:28:01 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- import org.apache.commons.vfs.*; + import org.apache.log4j.Logger; import org.eclipse.jface.action.*; import org.eclipse.jface.viewers.*; *************** *** 13,16 **** --- 14,19 ---- public class AddSelectionToPlaylist implements IWorkbenchWindowActionDelegate { + protected Logger logger = Logger.getLogger(getClass()); + private IWorkbenchWindow window; *************** *** 33,38 **** view.addPlaylistItems(selectedFiles); } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 36,40 ---- view.addPlaylistItems(selectedFiles); } catch (FileSystemException e) { ! logger.error(e,e); } } Index: ShowPlayer.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.musicplayer.contribution/src/org/jcommander/ui/musicplayer/contribution/actions/ShowPlayer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ShowPlayer.java 8 Mar 2006 08:41:16 -0000 1.1 --- ShowPlayer.java 25 Apr 2006 09:28:01 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- package org.jcommander.ui.musicplayer.contribution.actions; + import org.apache.log4j.Logger; import org.eclipse.jface.action.*; import org.eclipse.jface.viewers.*; *************** *** 9,12 **** --- 10,15 ---- public class ShowPlayer implements IWorkbenchWindowActionDelegate { + protected Logger logger = Logger.getLogger(getClass()); + private IWorkbenchWindow window; *************** *** 27,32 **** MusicplayerPlugin.getDefault().setMusicPlayerView(view); } catch (PartInitException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 30,34 ---- MusicplayerPlugin.getDefault().setMusicPlayerView(view); } catch (PartInitException e) { ! logger.error(e,e); } } Index: AddAndPlaySelected.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.musicplayer.contribution/src/org/jcommander/ui/musicplayer/contribution/actions/AddAndPlaySelected.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AddAndPlaySelected.java 9 Mar 2006 12:35:10 -0000 1.1 --- AddAndPlaySelected.java 25 Apr 2006 09:28:01 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- import org.apache.commons.vfs.*; + import org.apache.log4j.Logger; import org.eclipse.jface.action.*; import org.eclipse.jface.viewers.*; *************** *** 13,16 **** --- 14,19 ---- public class AddAndPlaySelected implements IWorkbenchWindowActionDelegate { + protected Logger logger = Logger.getLogger(getClass()); + private IWorkbenchWindow window; *************** *** 33,38 **** view.addPlaylistItems(selectedFiles); } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 36,40 ---- view.addPlaylistItems(selectedFiles); } catch (FileSystemException e) { ! logger.error(e,e); } } |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:28: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-serv25171/src/org/jcommander/ui/filepanel/actions Modified Files: SwitchToTreeAction.java ComputeDirectorySizeAction.java CopyToClipboard.java ComputeAllDirectorySizesAction.java SwitchToDirectoryAction.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: SwitchToDirectoryAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/SwitchToDirectoryAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SwitchToDirectoryAction.java 9 Jan 2006 01:08:32 -0000 1.1 --- SwitchToDirectoryAction.java 25 Apr 2006 09:27:58 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- package org.jcommander.ui.filepanel.actions; + import org.apache.log4j.Logger; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; *************** *** 10,13 **** --- 11,16 ---- public class SwitchToDirectoryAction implements IWorkbenchWindowActionDelegate { + Logger logger = Logger.getLogger(getClass()); + public void dispose() { // TODO Auto-generated method stub *************** *** 21,25 **** public void run(IAction action) { ! System.out.println("switch to directory action"); TabMediator activeTabMediator = FilePanelManagerProvider.getTabManager() .getActiveTabMediator(); --- 24,28 ---- public void run(IAction action) { ! logger.debug("switch to directory action"); TabMediator activeTabMediator = FilePanelManagerProvider.getTabManager() .getActiveTabMediator(); Index: CopyToClipboard.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/CopyToClipboard.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CopyToClipboard.java 1 Jan 2006 22:26:27 -0000 1.1 --- CopyToClipboard.java 25 Apr 2006 09:27:58 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- import org.apache.commons.vfs.*; import org.apache.commons.vfs.provider.local.*; + import org.apache.log4j.Logger; import org.eclipse.jface.action.*; import org.eclipse.jface.viewers.*; *************** *** 16,19 **** --- 17,22 ---- public class CopyToClipboard implements IWorkbenchWindowActionDelegate { + protected Logger logger = Logger.getLogger(getClass()); + private IWorkbenchWindow window; *************** *** 54,59 **** } } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } --- 57,61 ---- } } catch (FileSystemException e) { ! logger.error(e,e); } Index: ComputeAllDirectorySizesAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/ComputeAllDirectorySizesAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ComputeAllDirectorySizesAction.java 28 Dec 2005 11:34:05 -0000 1.2 --- ComputeAllDirectorySizesAction.java 25 Apr 2006 09:27:58 -0000 1.3 *************** *** 2,5 **** --- 2,6 ---- import org.apache.commons.vfs.*; + import org.apache.log4j.Logger; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.*; *************** *** 15,18 **** --- 16,21 ---- IWorkbenchWindowActionDelegate { + protected Logger logger = Logger.getLogger(getClass()); + public void dispose() { // TODO Auto-generated method stub *************** *** 57,62 **** return Status.OK_STATUS; } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); return Status.CANCEL_STATUS; --- 60,64 ---- return Status.OK_STATUS; } catch (FileSystemException e) { ! logger.error(e,e); return Status.CANCEL_STATUS; *************** *** 75,80 **** fileControlModel.getControl().doRefresh(); } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 77,81 ---- fileControlModel.getControl().doRefresh(); } catch (FileSystemException e) { ! logger.error(e,e); } } *************** *** 85,90 **** job.schedule(); } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 86,90 ---- job.schedule(); } catch (FileSystemException e) { ! logger.error(e,e); } } Index: ComputeDirectorySizeAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/ComputeDirectorySizeAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ComputeDirectorySizeAction.java 20 Jan 2006 14:17:26 -0000 1.4 --- ComputeDirectorySizeAction.java 25 Apr 2006 09:27:58 -0000 1.5 *************** *** 4,7 **** --- 4,8 ---- import org.apache.commons.vfs.*; + import org.apache.log4j.Logger; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.*; *************** *** 17,20 **** --- 18,23 ---- IWorkbenchWindowActionDelegate { + protected static Logger logger = Logger.getLogger(ComputeDirectorySizeAction.class); + public void dispose() { // TODO Auto-generated method stub *************** *** 72,77 **** fileControlModel.getControl().doRefresh(); } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 75,79 ---- fileControlModel.getControl().doRefresh(); } catch (FileSystemException e) { ! logger.error(e,e); } } *************** *** 98,103 **** } } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 100,104 ---- } } catch (FileSystemException e) { ! logger.error(e,e); } } Index: SwitchToTreeAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/SwitchToTreeAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SwitchToTreeAction.java 9 Jan 2006 01:08:32 -0000 1.1 --- SwitchToTreeAction.java 25 Apr 2006 09:27:58 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- package org.jcommander.ui.filepanel.actions; + import org.apache.log4j.Logger; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; *************** *** 15,18 **** --- 16,21 ---- public class SwitchToTreeAction implements IWorkbenchWindowActionDelegate { + Logger logger = Logger.getLogger(getClass()); + public void dispose() { // TODO Auto-generated method stub *************** *** 27,31 **** public void run(IAction action) { ! System.out.println("switch to tree action"); TabMediator activeTabMediator = FilePanelManagerProvider.getTabManager() .getActiveTabMediator(); --- 30,34 ---- public void run(IAction action) { ! logger.debug("switch to tree action"); TabMediator activeTabMediator = FilePanelManagerProvider.getTabManager() .getActiveTabMediator(); |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:28:05
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25171/src/org/jcommander/ui/filepanel/model Modified Files: FileControlModel.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: FileControlModel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/model/FileControlModel.java,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** FileControlModel.java 23 Mar 2006 02:55:32 -0000 1.55 --- FileControlModel.java 25 Apr 2006 09:27:58 -0000 1.56 *************** *** 11,14 **** --- 11,15 ---- import org.apache.commons.vfs.*; + import org.apache.log4j.Logger; import org.eclipse.jface.resource.*; import org.eclipse.jface.viewers.deferred.*; *************** *** 27,30 **** --- 28,34 ---- */ public class FileControlModel extends SetModel{ + + Logger logger = Logger.getLogger(getClass()); + private static final FileObject[] NULL_FILES = {}; *************** *** 224,228 **** catch(Exception e) { //ignore ! System.out.println("no item " + index + " in the table"); } } --- 228,232 ---- catch(Exception e) { //ignore ! logger.error("no item " + index + " in the table: " + e.getMessage()); } } *************** *** 722,727 **** } } catch (FileSystemException ex) { ! // TODO Do proper error reporting ! ex.printStackTrace(); } } --- 726,730 ---- } } catch (FileSystemException ex) { ! logger.error(ex,ex); } } *************** *** 778,782 **** } catch(Exception e) { ! System.out.println("no such element"); return null; } --- 781,785 ---- } catch(Exception e) { ! logger.error("no such element: " + e.getMessage()); return null; } *************** *** 845,850 **** control.selectNone(); } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } --- 848,852 ---- control.selectNone(); } catch (FileSystemException e) { ! logger.error(e,e); } *************** *** 858,863 **** control.setMarkedFiles(files); } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 860,864 ---- control.setMarkedFiles(files); } catch (FileSystemException e) { ! logger.error(e,e); } } |
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25171/src/org/jcommander/ui/filepanel/controls Modified Files: FilePanel.java FilePanelMediator.java DirectoryTreeManager.java FileTableControl.java FileTab.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: FilePanelMediator.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FilePanelMediator.java,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** FilePanelMediator.java 5 Apr 2006 20:34:31 -0000 1.48 --- FilePanelMediator.java 25 Apr 2006 09:27:57 -0000 1.49 *************** *** 288,293 **** public void inPlaceRename() { - //System.out.println("HERE!: " + fileControl.viewer.getSelection()); - //fileControl.viewer.editElement(fileControl.viewer.getSelection(), 1); // TODO Implement this as a cell editor! --- 288,291 ---- Index: DirectoryTreeManager.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/DirectoryTreeManager.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DirectoryTreeManager.java 5 Apr 2006 20:57:01 -0000 1.9 --- DirectoryTreeManager.java 25 Apr 2006 09:27:57 -0000 1.10 *************** *** 4,7 **** --- 4,8 ---- import org.apache.commons.vfs.*; + import org.apache.log4j.Logger; import org.eclipse.swt.*; import org.eclipse.swt.events.*; *************** *** 20,23 **** --- 21,26 ---- public class DirectoryTreeManager { + protected Logger logger = Logger.getLogger(getClass()); + private static final String DUMMY_ITEM_TEXT = ""; private Tree directoryTree; *************** *** 69,74 **** } } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 72,76 ---- } } catch (FileSystemException e) { ! logger.error(e,e); } } *************** *** 178,183 **** } } catch (FileSystemException e1) { ! // TODO Auto-generated catch block ! e1.printStackTrace(); } --- 180,184 ---- } } catch (FileSystemException e1) { ! logger.error(e1); } Index: FileTableControl.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTableControl.java,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** FileTableControl.java 26 Mar 2006 13:02:32 -0000 1.88 --- FileTableControl.java 25 Apr 2006 09:27:57 -0000 1.89 *************** *** 7,10 **** --- 7,11 ---- import org.apache.commons.vfs.*; + import org.apache.log4j.Logger; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.*; *************** *** 36,39 **** --- 37,43 ---- */ public class FileTableControl { + + Logger logger = Logger.getLogger(getClass()); + protected Shell shell; *************** *** 268,272 **** // // public void modify(Object element, String property, Object value) { ! // System.out.println("Trying to modify"); // } // --- 272,276 ---- // // public void modify(Object element, String property, Object value) { ! // logger.debug("Trying to modify"); // } // *************** *** 274,278 **** // FileDetails details = (FileDetails)element; // ! // System.out.println("property = " + property); // // return details.getDetails()[1]; --- 278,282 ---- // FileDetails details = (FileDetails)element; // ! // logger.debug("property = " + property); // // return details.getDetails()[1]; *************** *** 310,314 **** } catch(Exception ex) { ! ex.printStackTrace(); } } --- 314,318 ---- } catch(Exception ex) { ! logger.error(ex); } } *************** *** 365,369 **** } catch(FileSystemException ex) { ! ex.printStackTrace(); } } --- 369,373 ---- } catch(FileSystemException ex) { ! logger.error(ex); } } *************** *** 618,622 **** } catch (FileSystemException ex) { LoggerPlugin.getLogger(this.getClass()).error(ex,ex); - ex.printStackTrace(); } --- 622,625 ---- Index: FilePanel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FilePanel.java,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** FilePanel.java 5 Apr 2006 20:34:31 -0000 1.61 --- FilePanel.java 25 Apr 2006 09:27:57 -0000 1.62 *************** *** 6,9 **** --- 6,10 ---- import org.apache.commons.vfs.*; import org.apache.commons.vfs.provider.local.*; + import org.apache.log4j.Logger; import org.eclipse.jface.bindings.*; import org.eclipse.jface.resource.*; *************** *** 31,34 **** --- 32,37 ---- public class FilePanel extends Composite { + Logger logger = Logger.getLogger(getClass()); + private Composite partitionComposite = null; private Label partitionInfoLabel = null; *************** *** 123,128 **** fileControl.toggleSelectCurrentFile(false); } catch (FileSystemException e1) { ! // TODO Auto-generated catch block ! e1.printStackTrace(); } } --- 126,130 ---- fileControl.toggleSelectCurrentFile(false); } catch (FileSystemException e1) { ! logger.error(e1); } } *************** *** 737,741 **** public void switchToTree() { ! System.out.println("switch to tree"); if(sashForm.getMaximizedControl() == null) directoryTree.setFocus(); --- 739,743 ---- public void switchToTree() { ! logger.debug("switch to tree"); if(sashForm.getMaximizedControl() == null) directoryTree.setFocus(); Index: FileTab.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/controls/FileTab.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** FileTab.java 8 Jan 2006 12:43:44 -0000 1.40 --- FileTab.java 25 Apr 2006 09:27:57 -0000 1.41 *************** *** 7,10 **** --- 7,11 ---- import org.apache.commons.vfs.FileObject; + import org.apache.log4j.Logger; import org.eclipse.jface.preference.*; import org.eclipse.jface.resource.*; *************** *** 26,29 **** --- 27,32 ---- public class FileTab extends Composite { + protected Logger logger = Logger.getLogger(getClass()); + private SashForm bookmarkPanelsComposite = null; private Composite filePanelsComposite = null; *************** *** 371,375 **** } catch(Exception ex){ ! ex.printStackTrace(); } panel.getFileControl().setCurrentSelection(-1); --- 374,378 ---- } catch(Exception ex){ ! logger.error(ex); } panel.getFileControl().setCurrentSelection(-1); |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:28:03
|
Update of /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/src/org/jcommander/phileas/bookmarks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25118/src/org/jcommander/phileas/bookmarks Modified Files: BookmarksFileProvider.java BookmarksFileSystem.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: BookmarksFileSystem.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/src/org/jcommander/phileas/bookmarks/BookmarksFileSystem.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BookmarksFileSystem.java 15 Feb 2006 09:04:39 -0000 1.4 --- BookmarksFileSystem.java 25 Apr 2006 09:27:52 -0000 1.5 *************** *** 11,14 **** --- 11,15 ---- import org.apache.commons.vfs.*; import org.apache.commons.vfs.provider.*; + import org.apache.log4j.Logger; import org.jcommander.ui.logger.*; import org.jcommander.vfsextensions.*; *************** *** 18,21 **** --- 19,24 ---- public class BookmarksFileSystem extends AbstractFileSystem { + protected Logger logger = Logger.getLogger(getClass()); + public static final String JCMD_BMK_SCHEME = "jcmdbmk"; *************** *** 88,99 **** } catch (TransformerConfigurationException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } catch (FileNotFoundException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } catch (TransformerException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 91,99 ---- } catch (TransformerConfigurationException e) { ! logger.error(e,e); } catch (FileNotFoundException e) { ! logger.error(e,e); } catch (TransformerException e) { ! logger.error(e,e); } } Index: BookmarksFileProvider.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.phileas.bookmarks/src/org/jcommander/phileas/bookmarks/BookmarksFileProvider.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BookmarksFileProvider.java 21 Nov 2005 20:41:01 -0000 1.4 --- BookmarksFileProvider.java 25 Apr 2006 09:27:52 -0000 1.5 *************** *** 5,12 **** --- 5,15 ---- import org.apache.commons.vfs.*; import org.apache.commons.vfs.provider.*; + import org.apache.log4j.Logger; import org.jcommander.vfsextensions.*; public class BookmarksFileProvider extends AbstractOriginatingFileProvider { + protected Logger logger = Logger.getLogger(getClass()); + protected final static Collection capabilities = Collections.unmodifiableCollection(Arrays.asList(new Capability[] { *************** *** 33,37 **** return newFile; } catch (Exception e) { ! e.printStackTrace(); return null; } --- 36,40 ---- return newFile; } catch (Exception e) { ! logger.error(e,e); return null; } |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:28:03
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25171/src/org/jcommander/ui/filepanel/performers Modified Files: UiCopyListener.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: UiCopyListener.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/performers/UiCopyListener.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** UiCopyListener.java 21 Dec 2005 21:14:46 -0000 1.10 --- UiCopyListener.java 25 Apr 2006 09:27:58 -0000 1.11 *************** *** 5,8 **** --- 5,9 ---- import org.apache.commons.vfs.*; + import org.apache.log4j.Logger; import org.eclipse.jface.preference.*; import org.jcommander.ui.filepanel.*; *************** *** 14,17 **** --- 15,21 ---- public final class UiCopyListener implements CopyListener { + + protected Logger logger = Logger.getLogger(getClass()); + private final FileCopyPerformer performer; private final int UPDATE_INTERVAL; *************** *** 166,171 **** UiCopyListener.this.performer.prevSize = sourceFile.getContent().getSize(); } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } UiCopyListener.this.performer.progressDialogComposite.getIndividualProgressBar().setMaximum((int)UiCopyListener.this.performer.prevSize); --- 170,174 ---- UiCopyListener.this.performer.prevSize = sourceFile.getContent().getSize(); } catch (FileSystemException e) { ! logger.error(e,e); } UiCopyListener.this.performer.progressDialogComposite.getIndividualProgressBar().setMaximum((int)UiCopyListener.this.performer.prevSize); |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:28:02
|
Update of /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/src/org/jcommander/vfsextensions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25048/src/org/jcommander/vfsextensions Modified Files: VfsManagerExtension.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: VfsManagerExtension.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/src/org/jcommander/vfsextensions/VfsManagerExtension.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** VfsManagerExtension.java 5 Apr 2006 20:34:43 -0000 1.19 --- VfsManagerExtension.java 25 Apr 2006 09:27:47 -0000 1.20 *************** *** 8,11 **** --- 8,12 ---- import org.apache.commons.vfs.provider.sftp.SftpFileSystemConfigBuilder; import org.apache.commons.vfs.provider.smb.*; + import org.apache.log4j.Logger; import org.eclipse.core.runtime.*; import org.jcommander.vfsextensions.copy.*; *************** *** 15,18 **** --- 16,21 ---- public class VfsManagerExtension { + protected static Logger logger = Logger.getLogger(VfsManagerExtension.class); + protected static final String LOCAL_FILE_URI = "file:/"; protected static VfsManagerExtension instance; *************** *** 29,34 **** SftpFileSystemConfigBuilder.getInstance().setStrictHostKeyChecking(defaultFsOpts, "no"); } catch (FileSystemException ex) { ! // TODO Auto-generated catch block ! ex.printStackTrace(); } } --- 32,36 ---- SftpFileSystemConfigBuilder.getInstance().setStrictHostKeyChecking(defaultFsOpts, "no"); } catch (FileSystemException ex) { ! logger.error(ex,ex); } } *************** *** 119,123 **** } catch(Exception e) { ! e.printStackTrace(); return false; } --- 121,125 ---- } catch(Exception e) { ! logger.error(e,e); return false; } *************** *** 141,145 **** } catch(Exception e) { ! e.printStackTrace(); return false; } --- 143,147 ---- } catch(Exception e) { ! logger.error(e,e); return false; } |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:28:00
|
Update of /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/META-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25048/META-INF Modified Files: MANIFEST.MF Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.vfsextensions/META-INF/MANIFEST.MF,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MANIFEST.MF 15 Feb 2006 10:43:26 -0000 1.5 --- MANIFEST.MF 25 Apr 2006 09:27:47 -0000 1.6 *************** *** 10,14 **** org.apache.commons.vfs, org.apache.commons.vfs.dependencies, ! org.jcommander.tools.nativemanager Eclipse-AutoStart: true Export-Package: org.jcommander.vfsextensions, --- 10,15 ---- org.apache.commons.vfs, org.apache.commons.vfs.dependencies, ! org.jcommander.tools.nativemanager, ! org.apache.log4j Eclipse-AutoStart: true Export-Package: org.jcommander.vfsextensions, |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:27:58
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.compare/META-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24987/META-INF Modified Files: MANIFEST.MF Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/META-INF/MANIFEST.MF,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MANIFEST.MF 17 Apr 2006 21:31:08 -0000 1.3 --- MANIFEST.MF 25 Apr 2006 09:27:43 -0000 1.4 *************** *** 11,15 **** org.jcommander.eclipsepatch.compare, org.jcommander.ui.utils, ! org.jcommander.vfsextensions Eclipse-LazyStart: true Export-Package: org.jcommander.compare, --- 11,16 ---- org.jcommander.eclipsepatch.compare, org.jcommander.ui.utils, ! org.jcommander.vfsextensions, ! org.apache.log4j Eclipse-LazyStart: true Export-Package: org.jcommander.compare, |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:27:47
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.compare/src/org/jcommander/compare In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24987/src/org/jcommander/compare Modified Files: ComparePlugin.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: ComparePlugin.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.compare/src/org/jcommander/compare/ComparePlugin.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ComparePlugin.java 17 Apr 2006 21:31:07 -0000 1.4 --- ComparePlugin.java 25 Apr 2006 09:27:43 -0000 1.5 *************** *** 30,33 **** --- 30,34 ---- import org.osgi.framework.BundleContext; import org.apache.commons.vfs.*; + import org.apache.log4j.Logger; /** *************** *** 39,42 **** --- 40,45 ---- private static ComparePlugin plugin; + protected static Logger logger = Logger.getLogger(AbstractUIPlugin.class); + public static final String COMPARE_PERSPECTIVE_ID = "org.jcommander.compare.Compare"; *************** *** 74,78 **** public FileInput(FileObject file, String base) { ! //System.out.println(file.getName()); this.file=file; this.base=base; --- 77,81 ---- public FileInput(FileObject file, String base) { ! //logger.debug(file.getName()); this.file=file; this.base=base; *************** *** 80,84 **** public FileInput(FileObject file) { ! System.out.println(file.getName()); this.file=file; this.base=""; --- 83,87 ---- public FileInput(FileObject file) { ! logger.debug(file.getName()); this.file=file; this.base=""; *************** *** 89,93 **** */ public Object[] getChildren() { ! //System.out.println("getchildren"); try { if (file.getChildren()==null) --- 92,96 ---- */ public Object[] getChildren() { ! //logger.debug("getchildren"); try { if (file.getChildren()==null) *************** *** 104,108 **** filelist = file.getChildren(); } catch (FileSystemException e) { ! e.printStackTrace(); } --- 107,111 ---- filelist = file.getChildren(); } catch (FileSystemException e) { ! logger.error(e,e); } *************** *** 144,149 **** if (file.getType()==FileType.FOLDER) return ImageBroker.FOLDER_ICON; } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } int dot = file.getName().getBaseName().lastIndexOf('.'); --- 147,151 ---- if (file.getType()==FileType.FOLDER) return ImageBroker.FOLDER_ICON; } catch (FileSystemException e) { ! logger.error(e,e); } int dot = file.getName().getBaseName().lastIndexOf('.'); *************** *** 170,174 **** try { if (file.getType()==FileType.FOLDER) { ! System.out.println(FOLDER_TYPE); return FOLDER_TYPE; } else { --- 172,176 ---- try { if (file.getType()==FileType.FOLDER) { ! logger.debug(FOLDER_TYPE); return FOLDER_TYPE; } else { *************** *** 177,185 **** return name.substring(dot+1); } ! //System.out.println((file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE); //return (file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE; } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } return null; --- 179,186 ---- return name.substring(dot+1); } ! //logger.debug((file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE); //return (file.getType()==FileType.FOLDER)?FOLDER_TYPE:TEXT_TYPE; } catch (FileSystemException e) { ! logger.error(e,e); } return null; *************** *** 194,199 **** return file.getContent().getInputStream(); } catch (FileSystemException e1) { ! // TODO Auto-generated catch block ! e1.printStackTrace(); } return null; --- 195,199 ---- return file.getContent().getInputStream(); } catch (FileSystemException e1) { ! logger.error(e1); } return null; *************** *** 208,223 **** // TODO Auto-generated method stub try { ! System.out.println("setContent"); String nC=new String(newContent); ! System.out.println(nC); OutputStream oStream=file.getContent().getOutputStream(); oStream.write(nC.getBytes()); oStream.close(); } catch (FileSystemException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } catch (IOException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 208,221 ---- // TODO Auto-generated method stub try { ! logger.debug("setContent"); String nC=new String(newContent); ! logger.debug(nC); OutputStream oStream=file.getContent().getOutputStream(); oStream.write(nC.getBytes()); oStream.close(); } catch (FileSystemException e) { ! logger.error(e,e); } catch (IOException e) { ! logger.error(e,e); } } *************** *** 226,234 **** // TODO Implement! // if ((dest==null)&&(src!=null)) { ! // System.out.println("Add: "+((FileInput)src).file.getName().getURI()); // } else if ((dest!=null)&&(src==null)) { ! // System.out.println("Remove: "+((FileInput)src).file.getName().getURI()); // } ! System.out.println("replace"); try{ if (dest!=null) { --- 224,232 ---- // TODO Implement! // if ((dest==null)&&(src!=null)) { ! // logger.debug("Add: "+((FileInput)src).file.getName().getURI()); // } else if ((dest!=null)&&(src==null)) { ! // logger.debug("Remove: "+((FileInput)src).file.getName().getURI()); // } ! logger.debug("replace"); try{ if (dest!=null) { *************** *** 242,249 **** return fDest; } else { ! System.out.println("Error in FileInput.replace: Src no FileInput"); } } else { ! System.out.println("Error in FileInput.replace: Dest no FileInput"); } } else if (src!=null) { --- 240,247 ---- return fDest; } else { ! logger.error("Error in FileInput.replace: Src no FileInput"); } } else { ! logger.error("Error in FileInput.replace: Dest no FileInput"); } } else if (src!=null) { *************** *** 251,266 **** FileInput fSrc = (FileInput) src; FileObject fDest=file.resolveFile(fSrc.file.getName().getBaseName()); ! System.out.println("Copying to "+fDest.getName().getURI()); fDest.copyFrom(fSrc.file,new AllFileSelector()); return new FileInput(fDest,base); } else { ! System.out.println("Error in FileInput.replace: Src no FileInput"); } } else { ! System.out.println("Error in FileInput.replace: Src and Dest null"); } } catch (FileSystemException e) { ! // TODO: handle exception ! e.printStackTrace(); } return null; --- 249,263 ---- FileInput fSrc = (FileInput) src; FileObject fDest=file.resolveFile(fSrc.file.getName().getBaseName()); ! logger.debug("Copying to "+fDest.getName().getURI()); fDest.copyFrom(fSrc.file,new AllFileSelector()); return new FileInput(fDest,base); } else { ! logger.debug("Error in FileInput.replace: Src no FileInput"); } } else { ! logger.debug("Error in FileInput.replace: Src and Dest null"); } } catch (FileSystemException e) { ! logger.error(e,e); } return null; *************** *** 317,322 **** IWorkbenchPage page = PlatformUI.getWorkbench().showPerspective(COMPARE_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow()); } catch (WorkbenchException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } --- 314,318 ---- IWorkbenchPage page = PlatformUI.getWorkbench().showPerspective(COMPARE_PERSPECTIVE_ID, EclipseBroker.getWorkbenchWindow()); } catch (WorkbenchException e) { ! logger.error(e,e); } *************** *** 365,373 **** Object fRoot; Differencer d = new Differencer(); ! //System.out.println("Finding diffs"); fRoot = d.findDifferences(false,monitor,null,null, new FileInput(fLeftFile), new FileInput(fRightFile)); ! //System.out.println("found diffs"); return fRoot; --- 361,369 ---- Object fRoot; Differencer d = new Differencer(); ! //logger.debug("Finding diffs"); fRoot = d.findDifferences(false,monitor,null,null, new FileInput(fLeftFile), new FileInput(fRightFile)); ! //logger.debug("found diffs"); return fRoot; |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:27:43
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.intro/src/org/jcommander/ui/intro In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24940/src/org/jcommander/ui/intro Modified Files: WelcomeEnterListener.java Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: WelcomeEnterListener.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.intro/src/org/jcommander/ui/intro/WelcomeEnterListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WelcomeEnterListener.java 26 Jan 2006 14:17:50 -0000 1.3 --- WelcomeEnterListener.java 25 Apr 2006 09:27:39 -0000 1.4 *************** *** 1,4 **** --- 1,5 ---- package org.jcommander.ui.intro; + import org.apache.log4j.Logger; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseEvent; *************** *** 16,19 **** --- 17,22 ---- public class WelcomeEnterListener implements MouseTrackListener,MouseListener{ + Logger logger = Logger.getLogger(getClass()); + private WelcomeComposite wlcm; private Color focusOut; *************** *** 43,50 **** //TODO add appropriate action(s) here // if(wlcm.isDisplayEnterLabel()){ ! // System.out.println("entering JCommander"); // } // else{ ! // System.out.println("going back to JCommander"); // } --- 46,53 ---- //TODO add appropriate action(s) here // if(wlcm.isDisplayEnterLabel()){ ! // logger.debug("entering JCommander"); // } // else{ ! // logger.debug("going back to JCommander"); // } |
|
From: Robert E. <sky...@us...> - 2006-04-25 09:27:43
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.intro/META-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24940/META-INF Modified Files: MANIFEST.MF Log Message: Replaced System.out.println and printStackTrace() calls with Log4j logging statements so that every error gets into the log. Index: MANIFEST.MF =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.intro/META-INF/MANIFEST.MF,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MANIFEST.MF 15 Feb 2006 10:44:13 -0000 1.5 --- MANIFEST.MF 25 Apr 2006 09:27:39 -0000 1.6 *************** *** 9,13 **** Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, ! org.eclipse.ui.intro Eclipse-AutoStart: true Export-Package: org.jcommander.ui.intro --- 9,14 ---- Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, ! org.eclipse.ui.intro, ! org.apache.log4j Eclipse-AutoStart: true Export-Package: org.jcommander.ui.intro |
|
From: Robert E. <sky...@us...> - 2006-04-25 08:00:39
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/bookmarks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21804/src/org/jcommander/ui/filepanel/bookmarks Modified Files: BookmarkPanel.java Log Message: Temporary hide of bookmark navigation buttons Index: BookmarkPanel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/bookmarks/BookmarkPanel.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** BookmarkPanel.java 24 Apr 2006 20:26:33 -0000 1.16 --- BookmarkPanel.java 25 Apr 2006 08:00:28 -0000 1.17 *************** *** 20,29 **** public class BookmarkPanel extends Composite { ! private Button leftScrollButton = null; private BookmarkComposite bookmarkComposite = null; ! private Button rightScrollButton = null; private Button goUpButton = null; ! private Button startScrollButton = null; ! private Button endScrollButton = null; protected ArrayList bookmarkSelectionListeners; protected MouseAdapter focusFileControlAdapter; --- 20,29 ---- public class BookmarkPanel extends Composite { ! // private Button leftScrollButton = null; private BookmarkComposite bookmarkComposite = null; ! // private Button rightScrollButton = null; private Button goUpButton = null; ! // private Button startScrollButton = null; ! // private Button endScrollButton = null; protected ArrayList bookmarkSelectionListeners; protected MouseAdapter focusFileControlAdapter; *************** *** 59,74 **** GridLayout gridLayout1 = new GridLayout(); createComposite2(); ! startScrollButton = new Button(this, SWT.ARROW | SWT.LEFT | SWT.BORDER); ! startScrollButton.setEnabled(false); ! ! leftScrollButton = new Button(this, SWT.ARROW | SWT.LEFT); ! leftScrollButton.setEnabled(false); ! createComposite(); ! rightScrollButton = new Button(this, SWT.ARROW | SWT.RIGHT); ! rightScrollButton.setEnabled(false); ! ! endScrollButton = new Button(this, SWT.ARROW | SWT.RIGHT | SWT.BORDER); ! endScrollButton.setEnabled(false); goUpButton = new Button(this, SWT.ARROW | SWT.UP); --- 59,74 ---- GridLayout gridLayout1 = new GridLayout(); createComposite2(); ! // startScrollButton = new Button(this, SWT.ARROW | SWT.LEFT | SWT.BORDER); ! // startScrollButton.setEnabled(false); ! // ! // leftScrollButton = new Button(this, SWT.ARROW | SWT.LEFT); ! // leftScrollButton.setEnabled(false); ! // createComposite(); ! // rightScrollButton = new Button(this, SWT.ARROW | SWT.RIGHT); ! // rightScrollButton.setEnabled(false); ! // ! // endScrollButton = new Button(this, SWT.ARROW | SWT.RIGHT | SWT.BORDER); ! // endScrollButton.setEnabled(false); goUpButton = new Button(this, SWT.ARROW | SWT.UP); *************** *** 79,96 **** gridLayout1.verticalSpacing = 2; gridLayout1.horizontalSpacing = 2; ! leftScrollButton.setText("<"); ! leftScrollButton.setToolTipText("Scroll left"); ! leftScrollButton.setBackground(org.eclipse.swt.widgets.Display.getDefault().getSystemColor(org.eclipse.swt.SWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT)); ! rightScrollButton.setText(">"); ! rightScrollButton.setToolTipText("Scroll right"); goUpButton.setText("^"); goUpButton.setEnabled(true); goUpButton.setToolTipText("Go to parent bookmark group"); ! startScrollButton.setText("|<"); ! startScrollButton.setToolTipText("Scroll to start"); ! startScrollButton.setForeground(org.eclipse.swt.widgets.Display.getDefault().getSystemColor(org.eclipse.swt.SWT.COLOR_BLACK)); ! startScrollButton.setLayoutData(gridData5); ! endScrollButton.setText(">|"); ! endScrollButton.setToolTipText("Scroll to end"); gridData5.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER; gridData5.grabExcessVerticalSpace = false; --- 79,96 ---- gridLayout1.verticalSpacing = 2; gridLayout1.horizontalSpacing = 2; ! // leftScrollButton.setText("<"); ! // leftScrollButton.setToolTipText("Scroll left"); ! // leftScrollButton.setBackground(org.eclipse.swt.widgets.Display.getDefault().getSystemColor(org.eclipse.swt.SWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT)); ! // rightScrollButton.setText(">"); ! // rightScrollButton.setToolTipText("Scroll right"); goUpButton.setText("^"); goUpButton.setEnabled(true); goUpButton.setToolTipText("Go to parent bookmark group"); ! // startScrollButton.setText("|<"); ! // startScrollButton.setToolTipText("Scroll to start"); ! // startScrollButton.setForeground(org.eclipse.swt.widgets.Display.getDefault().getSystemColor(org.eclipse.swt.SWT.COLOR_BLACK)); ! // startScrollButton.setLayoutData(gridData5); ! // endScrollButton.setText(">|"); ! // endScrollButton.setToolTipText("Scroll to end"); gridData5.verticalAlignment = org.eclipse.swt.layout.GridData.CENTER; gridData5.grabExcessVerticalSpace = false; *************** *** 102,126 **** } }); ! endScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { ! public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { ! bookmarkComposite.scrollEnd(); ! } ! }); ! startScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { ! public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { ! bookmarkComposite.scrollStart(); ! } ! }); ! rightScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { ! public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { ! bookmarkComposite.scrollRight(); ! } ! }); ! leftScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { ! public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { ! bookmarkComposite.scrollLeft(); ! } ! ! }); } /** --- 102,126 ---- } }); ! // endScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { ! // public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { ! // bookmarkComposite.scrollEnd(); ! // } ! // }); ! // startScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { ! // public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { ! // bookmarkComposite.scrollStart(); ! // } ! // }); ! // rightScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { ! // public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { ! // bookmarkComposite.scrollRight(); ! // } ! // }); ! // leftScrollButton.addSelectionListener(new org.eclipse.swt.events.SelectionAdapter() { ! // public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) { ! // bookmarkComposite.scrollLeft(); ! // } ! // ! // }); } /** *************** *** 191,202 **** */ public void setFocusFileControlAdapter(MouseAdapter focusFileControlAdapter) { ! this.focusFileControlAdapter = focusFileControlAdapter; ! startScrollButton.addMouseListener(focusFileControlAdapter); ! leftScrollButton.addMouseListener(focusFileControlAdapter); ! rightScrollButton.addMouseListener(focusFileControlAdapter); ! endScrollButton.addMouseListener(focusFileControlAdapter); ! bookmarkComposite.setFocusFileControlAdapter(focusFileControlAdapter); } --- 191,202 ---- */ public void setFocusFileControlAdapter(MouseAdapter focusFileControlAdapter) { ! // this.focusFileControlAdapter = focusFileControlAdapter; ! // startScrollButton.addMouseListener(focusFileControlAdapter); ! // leftScrollButton.addMouseListener(focusFileControlAdapter); ! // rightScrollButton.addMouseListener(focusFileControlAdapter); ! // endScrollButton.addMouseListener(focusFileControlAdapter); ! // bookmarkComposite.setFocusFileControlAdapter(focusFileControlAdapter); } |
|
From: Matthias K <mat...@us...> - 2006-04-24 20:41:12
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22997/src/org/jcommander/ui/filepanel/actions Modified Files: SimpleOpenURLAction.java Log Message: Extracted the functions to show/hide a composite into new class HidableComposite Index: SimpleOpenURLAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/SimpleOpenURLAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SimpleOpenURLAction.java 24 Apr 2006 15:50:04 -0000 1.4 --- SimpleOpenURLAction.java 24 Apr 2006 20:40:58 -0000 1.5 *************** *** 26,29 **** --- 26,30 ---- import org.eclipse.ui.PlatformUI; import org.jcommander.ui.filepanel.FilePanelManagerProvider; + import org.jcommander.ui.filepanel.dialogs.HideableComposite; import org.jcommander.ui.logger.LoggerPlugin; import org.jcommander.ui.utils.FixedSizeQueue; *************** *** 52,61 **** private String dir; ! private Composite messageArea; private Text messageText; - - private int messageHeight = 60; - protected static final int MAX_URL_HISTORY_SIZE = 20; --- 53,59 ---- private String dir; ! private HideableComposite messageArea; private Text messageText; protected static final int MAX_URL_HISTORY_SIZE = 20; *************** *** 72,89 **** private void createMessageArea(){ if (messageAreaVisible) return; ! Point p = getShell().getSize(); ! messageText = new Text(messageArea,SWT.MULTI|SWT.V_SCROLL|SWT.BORDER|SWT.READ_ONLY); ! GridData messageTextData = new GridData(); ! messageTextData.grabExcessHorizontalSpace=true; ! messageTextData.grabExcessVerticalSpace=true; ! messageTextData.horizontalAlignment=SWT.FILL; ! messageTextData.verticalAlignment=SWT.FILL; ! messageTextData.minimumHeight=60; ! messageText.setLayoutData(messageTextData); ! getShell().pack(); messageAreaVisible=true; - System.out.println(messageArea.getSize().y); - messageHeight=messageArea.getSize().y; - getShell().setSize(p.x, p.y+messageHeight); } --- 70,75 ---- private void createMessageArea(){ if (messageAreaVisible) return; ! messageArea.setVisible(true); messageAreaVisible=true; } *************** *** 136,140 **** } ! messageArea=new Composite(dialogArea, SWT.NONE); GridData messageData=new GridData(); messageData.horizontalAlignment=SWT.FILL; --- 122,143 ---- } ! messageArea = new HideableComposite(dialogArea,SWT.NONE) { ! ! /* (non-Javadoc) ! * @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; ! messageTextData.grabExcessVerticalSpace=true; ! messageTextData.horizontalAlignment=SWT.FILL; ! messageTextData.verticalAlignment=SWT.FILL; ! messageTextData.minimumHeight=60; ! messageText.setLayoutData(messageTextData); ! } ! ! }; ! GridData messageData=new GridData(); messageData.horizontalAlignment=SWT.FILL; *************** *** 142,149 **** messageData.horizontalSpan=2; messageArea.setLayoutData(messageData); - GridLayout messageLayout = new GridLayout(); - messageLayout.marginWidth=0; - messageLayout.marginHeight=1; - messageArea.setLayout(messageLayout); return dialogArea; --- 145,148 ---- |
|
From: Matthias K <mat...@us...> - 2006-04-24 20:41:09
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22997/src/org/jcommander/ui/filepanel/dialogs Modified Files: CustomConfirmDialogComposite.java Added Files: HideableComposite.java Log Message: Extracted the functions to show/hide a composite into new class HidableComposite --- NEW FILE: HideableComposite.java --- /** * */ 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; import org.eclipse.swt.widgets.Shell; /** * @author MatthiasK * */ public class HideableComposite{ protected Composite composite; protected Composite contents=null; private boolean visible; private int height; /** * @param parent * @param style */ public HideableComposite(Composite parent, int style) { composite = new Composite(parent, style); GridLayout compositeLayout = new GridLayout(); compositeLayout.marginWidth=0; compositeLayout.marginHeight=1; composite.setLayout(compositeLayout); } protected void appear(){ 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; composite.getShell().setSize(p.x, p.y+height); visible=true; } } protected void disappear(){ if (visible) { contents.dispose(); contents=null; Shell shell = composite.getShell(); shell.setSize(shell.getSize().x, shell.getSize().y-height); visible=false; } } protected void createContents(Composite parent){ } public void setLayoutData(Object layoutData){ composite.setLayoutData(layoutData); } public boolean isVisible() { return visible; } public void setVisible(boolean visible) { if (visible) { appear(); } else { disappear(); } } } Index: CustomConfirmDialogComposite.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/dialogs/CustomConfirmDialogComposite.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CustomConfirmDialogComposite.java 17 Apr 2006 17:58:31 -0000 1.4 --- CustomConfirmDialogComposite.java 24 Apr 2006 20:40:58 -0000 1.5 *************** *** 151,154 **** --- 151,155 ---- //b.setVisible(true); composite.layout(true); + //detailsComposite.setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_RED)); Point p = detailsContent.getSize(); detailsHeight = p.y; |
|
From: Robert E. <sky...@us...> - 2006-04-24 20:26:36
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/bookmarks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12390/src/org/jcommander/ui/filepanel/bookmarks Modified Files: BookmarkPanel.java Log Message: Temporarily disabled the scroll buttons due to confusing behavior to users. Index: BookmarkPanel.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/bookmarks/BookmarkPanel.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** BookmarkPanel.java 14 Nov 2005 00:02:17 -0000 1.15 --- BookmarkPanel.java 24 Apr 2006 20:26:33 -0000 1.16 *************** *** 60,70 **** --- 60,74 ---- createComposite2(); startScrollButton = new Button(this, SWT.ARROW | SWT.LEFT | SWT.BORDER); + startScrollButton.setEnabled(false); leftScrollButton = new Button(this, SWT.ARROW | SWT.LEFT); + leftScrollButton.setEnabled(false); createComposite(); rightScrollButton = new Button(this, SWT.ARROW | SWT.RIGHT); + rightScrollButton.setEnabled(false); endScrollButton = new Button(this, SWT.ARROW | SWT.RIGHT | SWT.BORDER); + endScrollButton.setEnabled(false); goUpButton = new Button(this, SWT.ARROW | SWT.UP); |
|
From: Robert E. <sky...@us...> - 2006-04-24 20:10:42
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.externaltools/src/org/jcommander/ui/externaltools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32729/src/org/jcommander/ui/externaltools Modified Files: ExternaltoolsPlugin.java Log Message: Fixed bug [ 1475770 ] No environment propagation to the command prompt Index: ExternaltoolsPlugin.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.externaltools/src/org/jcommander/ui/externaltools/ExternaltoolsPlugin.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ExternaltoolsPlugin.java 10 Dec 2005 21:18:42 -0000 1.7 --- ExternaltoolsPlugin.java 24 Apr 2006 20:10:37 -0000 1.8 *************** *** 162,166 **** try { Runtime.getRuntime().exec( commandPrompt, ! new String[]{}, new File(VfsManagerExtension.getExecutableName(workingDirectory))); } catch (IOException ex) { --- 162,166 ---- try { Runtime.getRuntime().exec( commandPrompt, ! null, new File(VfsManagerExtension.getExecutableName(workingDirectory))); } catch (IOException ex) { |
|
From: Matthias K <mat...@us...> - 2006-04-24 15:50:14
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2883/src/org/jcommander/ui/filepanel/actions Modified Files: SimpleOpenURLAction.java Log Message: - Better Layout - Cleaned up code Index: SimpleOpenURLAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/SimpleOpenURLAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SimpleOpenURLAction.java 20 Apr 2006 17:05:30 -0000 1.3 --- SimpleOpenURLAction.java 24 Apr 2006 15:50:04 -0000 1.4 *************** *** 12,15 **** --- 12,17 ---- import org.eclipse.jface.viewers.ISelection; import org.eclipse.swt.SWT; + import org.eclipse.swt.graphics.Color; + import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; *************** *** 35,64 **** private IWorkbenchWindow window; - - private Combo protokollCombo; - private Combo hostCombo; - private Text userNameText; - private Text userPasswordText; - private Combo dirCombo; ! private String protokoll; ! private String host; ! private String userName; ! private String userPassword; ! private String dir; ! ! private Composite messageArea; ! private Text messageText; ! private boolean messageAreaVisible=false; ! ! private int messageHeight = 60; ! ! protected static final int MAX_URL_HISTORY_SIZE = 20; ! protected static FixedSizeQueue hostHistory = new FixedSizeQueue(MAX_URL_HISTORY_SIZE); ! protected static FixedSizeQueue dirHistory = new FixedSizeQueue(MAX_URL_HISTORY_SIZE); ! ! private class EnterTargetDialog extends TitleAreaDialog { protected EnterTargetDialog(Shell shell) { --- 37,68 ---- private IWorkbenchWindow window; ! private static class EnterTargetDialog extends TitleAreaDialog { ! ! private Combo protokollCombo; ! private Combo hostCombo; ! private Text userNameText; ! private Text userPasswordText; ! private Combo dirCombo; ! private String protokoll; ! private String host; ! private String userName; ! private String userPassword; ! private String dir; ! ! private Composite messageArea; ! private Text messageText; ! ! ! private int messageHeight = 60; ! ! protected static final int MAX_URL_HISTORY_SIZE = 20; ! ! protected static FixedSizeQueue hostHistory = new FixedSizeQueue(MAX_URL_HISTORY_SIZE); ! protected static FixedSizeQueue dirHistory = new FixedSizeQueue(MAX_URL_HISTORY_SIZE); ! ! private boolean messageAreaVisible=false; protected EnterTargetDialog(Shell shell) { *************** *** 68,71 **** --- 72,76 ---- private void createMessageArea(){ if (messageAreaVisible) return; + Point p = getShell().getSize(); messageText = new Text(messageArea,SWT.MULTI|SWT.V_SCROLL|SWT.BORDER|SWT.READ_ONLY); GridData messageTextData = new GridData(); *************** *** 76,86 **** messageTextData.minimumHeight=60; messageText.setLayoutData(messageTextData); ! messageArea.layout(true); ! getShell().layout(true); ! getShell().setSize(getShell().getSize().x, getShell().getSize().y+messageHeight); ! messageArea.layout(true); ! getShell().layout(true); messageAreaVisible=true; ! //messageHeight=messageArea.getSize().y; } --- 81,89 ---- messageTextData.minimumHeight=60; messageText.setLayoutData(messageTextData); ! getShell().pack(); messageAreaVisible=true; ! System.out.println(messageArea.getSize().y); ! messageHeight=messageArea.getSize().y; ! getShell().setSize(p.x, p.y+messageHeight); } *************** *** 141,144 **** --- 144,148 ---- GridLayout messageLayout = new GridLayout(); messageLayout.marginWidth=0; + messageLayout.marginHeight=1; messageArea.setLayout(messageLayout); *************** *** 148,162 **** // @Override protected void okPressed() { - - // if (messageText!=null) { - // messageText.dispose(); - // messageText=null; - // shell.layout(true); - // shell.setSize(shellSize.x, shellSize.y-messageHeight); - // } - // else { - // createMessageArea(); - // } - protokoll=protokollCombo.getText(); userName=userNameText.getText(); --- 152,155 ---- |
|
From: Matthias K <mat...@us...> - 2006-04-20 17:05:41
|
Update of /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20396/src/org/jcommander/ui/filepanel/actions Modified Files: SimpleOpenURLAction.java Log Message: - changed title - combo for Protokoll - combo with history for host and directory Index: SimpleOpenURLAction.java =================================================================== RCS file: /cvsroot/jcommander/plugins/org.jcommander.ui.filepanel/src/org/jcommander/ui/filepanel/actions/SimpleOpenURLAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SimpleOpenURLAction.java 20 Apr 2006 08:48:22 -0000 1.2 --- SimpleOpenURLAction.java 20 Apr 2006 17:05:30 -0000 1.3 *************** *** 14,17 **** --- 14,18 ---- import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; + import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; *************** *** 24,27 **** --- 25,29 ---- import org.jcommander.ui.filepanel.FilePanelManagerProvider; import org.jcommander.ui.logger.LoggerPlugin; + import org.jcommander.ui.utils.FixedSizeQueue; import org.jcommander.vfsextensions.VfsManagerExtension; *************** *** 34,42 **** private IWorkbenchWindow window; ! private Text protokollText; ! private Text hostText; private Text userNameText; private Text userPasswordText; ! private Text dirText; private String protokoll; --- 36,44 ---- private IWorkbenchWindow window; ! private Combo protokollCombo; ! private Combo hostCombo; private Text userNameText; private Text userPasswordText; ! private Combo dirCombo; private String protokoll; *************** *** 52,55 **** --- 54,63 ---- private int messageHeight = 60; + protected static final int MAX_URL_HISTORY_SIZE = 20; + + protected static FixedSizeQueue hostHistory = new FixedSizeQueue(MAX_URL_HISTORY_SIZE); + protected static FixedSizeQueue dirHistory = new FixedSizeQueue(MAX_URL_HISTORY_SIZE); + + private class EnterTargetDialog extends TitleAreaDialog { *************** *** 77,99 **** } - // @Override protected Control createDialogArea(Composite parent) { ! setTitle("Open VFS directory"); Composite dialogAreaSub = (Composite)super.createDialogArea(parent); Composite dialogArea = new Composite(dialogAreaSub, SWT.NONE); dialogArea.setLayout(new GridLayout(2,false)); dialogArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL,true,false)); Label protokolLabel = new Label(dialogArea, SWT.NONE); protokolLabel.setText("Protokoll"); ! protokollText = new Text(dialogArea, SWT.BORDER); ! protokollText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false)); Label hostLabel = new Label(dialogArea, SWT.NONE); hostLabel.setText("Host"); ! hostText = new Text(dialogArea, SWT.BORDER); ! hostText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false)); Label usernameLabel = new Label(dialogArea, SWT.NONE); usernameLabel.setText("Username"); userNameText = new Text(dialogArea, SWT.BORDER); userNameText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false)); Label userPasswordLabel = new Label(dialogArea, SWT.NONE); userPasswordLabel.setText("Password"); --- 85,120 ---- } protected Control createDialogArea(Composite parent) { ! getShell().setText("Open VFS directory"); ! setTitle("Specify a location"); Composite dialogAreaSub = (Composite)super.createDialogArea(parent); Composite dialogArea = new Composite(dialogAreaSub, SWT.NONE); dialogArea.setLayout(new GridLayout(2,false)); dialogArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL,true,false)); + Label protokolLabel = new Label(dialogArea, SWT.NONE); protokolLabel.setText("Protokoll"); ! protokollCombo = new Combo(dialogArea, SWT.BORDER);//new Text(dialogArea, SWT.BORDER); ! protokollCombo.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false)); ! protokollCombo.add("sftp"); ! protokollCombo.add("ftp"); ! protokollCombo.add("https"); ! protokollCombo.add("http"); ! protokollCombo.select(0); ! Label hostLabel = new Label(dialogArea, SWT.NONE); hostLabel.setText("Host"); ! hostCombo = new Combo(dialogArea, SWT.BORDER); ! hostCombo.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false)); ! Object[] hostHistoryItems = hostHistory.getItems(); ! for(int i=0;i<hostHistoryItems.length;i++) { ! hostCombo.add(hostHistoryItems[i].toString()); ! } ! Label usernameLabel = new Label(dialogArea, SWT.NONE); usernameLabel.setText("Username"); userNameText = new Text(dialogArea, SWT.BORDER); userNameText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false)); + Label userPasswordLabel = new Label(dialogArea, SWT.NONE); userPasswordLabel.setText("Password"); *************** *** 101,110 **** userPasswordText.setEchoChar('*'); userPasswordText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false)); Label dirLabel = new Label(dialogArea, SWT.NONE); dirLabel.setText("Directory"); ! dirText = new Text(dialogArea, SWT.BORDER); ! dirText.setText("/"); ! dirText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false)); ! messageArea=new Composite(dialogArea, SWT.NONE); GridData messageData=new GridData(); --- 122,136 ---- userPasswordText.setEchoChar('*'); userPasswordText.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false)); + Label dirLabel = new Label(dialogArea, SWT.NONE); dirLabel.setText("Directory"); ! dirCombo = new Combo(dialogArea, SWT.BORDER); ! dirCombo.setText("/"); ! dirCombo.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT,true,false)); ! Object[] dirHistoryItems = dirHistory.getItems(); ! for(int i=0;i<dirHistoryItems.length;i++) { ! dirCombo.add(dirHistoryItems[i].toString()); ! } ! messageArea=new Composite(dialogArea, SWT.NONE); GridData messageData=new GridData(); *************** *** 133,146 **** // } ! protokoll=protokollText.getText(); userName=userNameText.getText(); userPassword=userPasswordText.getText(); ! host=hostText.getText(); ! dir=dirText.getText(); String userData=""; if (userName!="") userData=userName; if (userPassword!="") userData=userData+":"+userPassword; if (userData!="") userData=userData+"@"; ! String url=protokoll+"://"+userData+host+"/"+dir; if (performOk(url)) { super.okPressed(); --- 159,172 ---- // } ! protokoll=protokollCombo.getText(); userName=userNameText.getText(); userPassword=userPasswordText.getText(); ! host=hostCombo.getText(); ! dir=dirCombo.getText(); String userData=""; if (userName!="") userData=userName; if (userPassword!="") userData=userData+":"+userPassword; if (userData!="") userData=userData+"@"; ! String url=protokoll+"://"+userData+host+dir; if (performOk(url)) { super.okPressed(); *************** *** 170,174 **** .refresh(); ! //urlHistory.add(selectedDirectory); return true; } else { --- 196,201 ---- .refresh(); ! hostHistory.add(host); ! dirHistory.add(dir); return true; } else { *************** *** 187,190 **** --- 214,220 ---- cause=cause.getCause(); } + if (userPassword!="") { + message = message.replaceAll(":([^@:]*)@", "@"); + } setMessage("The directory could not be opened.", IMessageProvider.ERROR); setError(message); |
