From: Marcelo V. <va...@us...> - 2010-04-17 22:44:59
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "ProjectViewer jEdit plugin". The branch, master has been updated via 3e7c4ea659b479fab9399983e86109e9410ce2b0 (commit) via 899bd57b04e98857f56cc6718a1195b10c2eb4a0 (commit) via 2e70b74768cb7fab07364d9b5890a9af5ffce045 (commit) via f1812481fba587064e91071d79298b403dc2ad95 (commit) from bba5bb47b6451ba74a9fec6db1bde7848379f3da (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3e7c4ea659b479fab9399983e86109e9410ce2b0 Author: Marcelo Vanzin <va...@us...> Date: Sat Apr 17 15:31:55 2010 -0700 Fix potential NPE when retrieving file information. For whatever reason, VFSFile.getVFS() was causing an NPE down the call chain in some cases. Calling VFSManager.getVFSForPath() directly (since we have the URL) always works, even though the same call is made in the case of VFSFile.getVFS(). Go figure. diff --git a/projectviewer/vpt/VPTFile.java b/projectviewer/vpt/VPTFile.java index 7c9cbf0..2f95c50 100644 --- a/projectviewer/vpt/VPTFile.java +++ b/projectviewer/vpt/VPTFile.java @@ -153,7 +153,10 @@ public class VPTFile extends VPTNode protected VFSFile getFile(boolean lazy) { if (vfsfile != null) { - int caps = vfsfile.getVFS().getCapabilities(); + VFS vfs = VFSManager.getVFSForPath(url); + assert vfs != null : "Unloaded VFS?"; + + int caps = vfs.getCapabilities(); if ((caps & VFS.LOW_LATENCY_CAP) != VFS.LOW_LATENCY_CAP) { return vfsfile; } commit 899bd57b04e98857f56cc6718a1195b10c2eb4a0 Author: Marcelo Vanzin <va...@us...> Date: Sat Apr 17 15:06:27 2010 -0700 Make project list combo painting more efficient. This fixes SF bug #2986429. To speed up painting, don't modify the JButton instance's state unless absolutely necessary, by caching the information of the previous paint operations. This avoids two things: . calling setText() and forcing the parent class's paint() method to do more work than necessary. . redundant calls to PVActions.clipText(). diff --git a/projectviewer/gui/ProjectComboBox.java b/projectviewer/gui/ProjectComboBox.java index b1e76b4..2168142 100644 --- a/projectviewer/gui/ProjectComboBox.java +++ b/projectviewer/gui/ProjectComboBox.java @@ -67,6 +67,8 @@ public class ProjectComboBox extends JButton private View view; private VPTNode active; private boolean showOnNextEvent; + private int lastWidth; + private String clippedText; //{{{ +ProjectComboBox(View) : <init> public ProjectComboBox(View view) { @@ -87,7 +89,6 @@ public class ProjectComboBox extends JButton menu = new GroupMenu(null, true, true, this); active = VPTRoot.getInstance(); - setText(" " + active.getName()); popup = new JPopupMenu(); updateMenu(); @@ -107,7 +108,7 @@ public class ProjectComboBox extends JButton //{{{ +setSelectedNode(VPTNode) : void public void setSelectedNode(VPTNode node) { active = node; - setText(" " + active.getName()); + clippedText = null; } //}}} //{{{ +isFocusable() : boolean @@ -172,35 +173,37 @@ public class ProjectComboBox extends JButton showOnNextEvent = true; } //}}} - //{{{ +paintComponent(Graphics) : void + //{{{ +paint(Graphics) : void /** * Draws the button with an arrow on the right hand side. This will * kinda look like a Metal L&F combo box button, but, whatever... */ - public void paintComponent(Graphics g) { - g.clearRect(0, 0, getWidth(), getHeight()); - - // Figure out how much of the text to paint. - String text = getText(); - setText(PVActions.clipText(text, - getWidth() - 20, - getFontMetrics(getFont()), - true)); + public void paint(Graphics g) + { + if (getWidth() != lastWidth || clippedText == null) { + lastWidth = getWidth(); + clippedText = PVActions.clipText(" " + active.getName(), + getWidth() - 20, + getFontMetrics(getFont()), + true); + setText(clippedText); + } super.paintComponent(g); - setText(text); - int[] x = new int[3]; - int[] y = new int[3]; + if (g.getClipBounds().width > 16) { + int[] x = new int[3]; + int[] y = new int[3]; - x[0] = getWidth() - 16; - x[1] = x[0] + 10; - x[2] = x[0] + 5; + x[0] = getWidth() - 16; + x[1] = x[0] + 10; + x[2] = x[0] + 5; - y[0] = 8; - y[1] = y[0]; - y[2] = getHeight() - y[0]; + y[0] = 8; + y[1] = y[0]; + y[2] = getHeight() - y[0]; - g.fillPolygon(x, y, 3); + g.fillPolygon(x, y, 3); + } } //}}} } commit 2e70b74768cb7fab07364d9b5890a9af5ffce045 Author: Marcelo Vanzin <va...@us...> Date: Sat Apr 3 14:25:48 2010 -0700 Remove RCS "$Id$" keywords. They don't make sense in git. diff --git a/dockables.xml b/dockables.xml index 33a1f45..2ef39fd 100644 --- a/dockables.xml +++ b/dockables.xml @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE DOCKABLES SYSTEM "dockables.dtd"> <!-- Dockable component definition file for ProjectViewser plugin --> -<!-- $Id$ ---> - -<!-- ProjectViewser dockable windows --> <DOCKABLES> <DOCKABLE NAME="projectviewer" MOVABLE="TRUE"> diff --git a/docs/CHANGELOG b/docs/CHANGELOG index a6ff0c4..9723659 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -12,8 +12,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * CHANGELOG version: $Id$ */ Version 3.0.0: diff --git a/projectviewer/PVActions.java b/projectviewer/PVActions.java index 8464b41..7950469 100644 --- a/projectviewer/PVActions.java +++ b/projectviewer/PVActions.java @@ -63,7 +63,6 @@ import projectviewer.action.SearchAction; * plugin. * * @author Marcelo Vanzin - * @version $Id$ */ public final class PVActions { diff --git a/projectviewer/PVMenuProvider.java b/projectviewer/PVMenuProvider.java index 4dd18ae..7c71b8c 100644 --- a/projectviewer/PVMenuProvider.java +++ b/projectviewer/PVMenuProvider.java @@ -42,7 +42,6 @@ import projectviewer.vpt.VPTRoot; * dynamic sub-menus, this has to take care of the static entries also. * * @author Marcelo Vanzin - * @version $Id$ */ public final class PVMenuProvider implements DynamicMenuProvider, ActionListener { diff --git a/projectviewer/ProjectManager.java b/projectviewer/ProjectManager.java index 3f50a3a..1619c52 100644 --- a/projectviewer/ProjectManager.java +++ b/projectviewer/ProjectManager.java @@ -72,7 +72,6 @@ import projectviewer.persist.ProjectPersistenceManager; * names. * * @author Marcelo Vanzin (with some code from older versions) - * @version $Id$ */ public final class ProjectManager { diff --git a/projectviewer/ProjectViewer.java b/projectviewer/ProjectViewer.java index 1c5f522..0e06260 100644 --- a/projectviewer/ProjectViewer.java +++ b/projectviewer/ProjectViewer.java @@ -94,7 +94,6 @@ import projectviewer.importer.NewFileImporter; * Main GUI for the project viewer plugin. * * @author Marcelo Vanzin (with much code from original version) - * @version $Id$ */ public final class ProjectViewer extends JPanel implements DefaultFocusComponent diff --git a/projectviewer/VFSHelper.java b/projectviewer/VFSHelper.java index 32a009b..e48a4fc 100644 --- a/projectviewer/VFSHelper.java +++ b/projectviewer/VFSHelper.java @@ -32,8 +32,8 @@ import org.gjt.sp.jedit.io.VFSManager; /** * Class with helper functions for dealing with jEdit's VFS. * - * @version $Id$ - * @since PV 3.0.0 + * @author Marcelo Vanzin + * @since PV 3.0.0 */ public class VFSHelper { diff --git a/projectviewer/action/Action.java b/projectviewer/action/Action.java index 94ac2c8..fbc347f 100644 --- a/projectviewer/action/Action.java +++ b/projectviewer/action/Action.java @@ -38,7 +38,6 @@ import projectviewer.vpt.VPTNode; * item in the tree's context menu. * * @author Marcelo Vanzin - * @version $Id$ */ public abstract class Action implements ActionListener, Cloneable, Comparable<Action> diff --git a/projectviewer/action/ActionSeparator.java b/projectviewer/action/ActionSeparator.java index aa9dbd3..4a6ee3d 100644 --- a/projectviewer/action/ActionSeparator.java +++ b/projectviewer/action/ActionSeparator.java @@ -34,7 +34,6 @@ import projectviewer.vpt.VPTNode; * shown. * * @author Marcelo Vanzin - * @version $Id$ */ public class ActionSeparator extends Action { diff --git a/projectviewer/action/ArchiveAction.java b/projectviewer/action/ArchiveAction.java index 9f17809..2c7be0e 100644 --- a/projectviewer/action/ArchiveAction.java +++ b/projectviewer/action/ArchiveAction.java @@ -34,7 +34,6 @@ import projectviewer.persist.ProjectZipper; * Opens the search dialog for the selected directory/project. * * @author Marcelo Vanzin - * @version $Id$ */ public class ArchiveAction extends Action { diff --git a/projectviewer/action/CollapseAllAction.java b/projectviewer/action/CollapseAllAction.java index 2f82c16..d013377 100644 --- a/projectviewer/action/CollapseAllAction.java +++ b/projectviewer/action/CollapseAllAction.java @@ -35,7 +35,6 @@ import org.gjt.sp.jedit.GUIUtilities; * Expands all nodes of the current tree. * * @author Marcelo Vanzin - * @version $Id$ */ public class CollapseAllAction extends Action { diff --git a/projectviewer/action/EditGroupAction.java b/projectviewer/action/EditGroupAction.java index 54f74bc..8360616 100644 --- a/projectviewer/action/EditGroupAction.java +++ b/projectviewer/action/EditGroupAction.java @@ -42,7 +42,6 @@ import projectviewer.vpt.VPTNode; * Action that when executed creates a new group or edits an existing one. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 2.1.0 */ public class EditGroupAction extends Action { diff --git a/projectviewer/action/EditProjectAction.java b/projectviewer/action/EditProjectAction.java index 08ad4c6..eb45272 100644 --- a/projectviewer/action/EditProjectAction.java +++ b/projectviewer/action/EditProjectAction.java @@ -47,7 +47,6 @@ import projectviewer.importer.RootImporter; * Action that when executed creates a new project or edits an existing one. * * @author Marcelo Vanzin - * @version $Id$ */ public class EditProjectAction extends Action { diff --git a/projectviewer/action/ExpandAllAction.java b/projectviewer/action/ExpandAllAction.java index c779f16..cf893a7 100644 --- a/projectviewer/action/ExpandAllAction.java +++ b/projectviewer/action/ExpandAllAction.java @@ -35,7 +35,6 @@ import org.gjt.sp.jedit.GUIUtilities; * Expands all nodes of the current tree. * * @author Marcelo Vanzin (based on code from old ProjectViewer class) - * @version $Id$ */ public class ExpandAllAction extends Action { diff --git a/projectviewer/action/FileImportAction.java b/projectviewer/action/FileImportAction.java index c42d3a3..54a1c95 100644 --- a/projectviewer/action/FileImportAction.java +++ b/projectviewer/action/FileImportAction.java @@ -31,7 +31,6 @@ import projectviewer.importer.FileImporter; * Action that when executed imports files into a node. * * @author Marcelo Vanzin - * @version $Id$ */ public class FileImportAction extends Action { diff --git a/projectviewer/action/LaunchBrowserAction.java b/projectviewer/action/LaunchBrowserAction.java index 235fda2..c17cdb7 100644 --- a/projectviewer/action/LaunchBrowserAction.java +++ b/projectviewer/action/LaunchBrowserAction.java @@ -43,7 +43,6 @@ import infoviewer.InfoViewerPlugin; * absolute path to the file is given to the browser. * * @author Marcelo Vanzin (based on code from Matthew Payne) - * @version $Id$ */ public class LaunchBrowserAction extends Action { diff --git a/projectviewer/action/MoveNodeAction.java b/projectviewer/action/MoveNodeAction.java index ee32962..a420ca2 100644 --- a/projectviewer/action/MoveNodeAction.java +++ b/projectviewer/action/MoveNodeAction.java @@ -44,7 +44,6 @@ import projectviewer.vpt.VPTRoot; * Action to move a project or group into another group. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 2.1.0 */ public class MoveNodeAction extends Action { diff --git a/projectviewer/action/NodePropertiesAction.java b/projectviewer/action/NodePropertiesAction.java index dbc0691..b62d692 100644 --- a/projectviewer/action/NodePropertiesAction.java +++ b/projectviewer/action/NodePropertiesAction.java @@ -29,7 +29,6 @@ import projectviewer.vpt.VPTNode; * Shows a dialog with properties for the selected node. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public class NodePropertiesAction extends Action diff --git a/projectviewer/action/NodeRemoverAction.java b/projectviewer/action/NodeRemoverAction.java index 08a77ca..8debaa6 100644 --- a/projectviewer/action/NodeRemoverAction.java +++ b/projectviewer/action/NodeRemoverAction.java @@ -54,7 +54,6 @@ import projectviewer.vpt.VPTRoot; * Action that when executed removes nodes from the trees. * * @author Marcelo Vanzin - * @version $Id$ */ public class NodeRemoverAction extends Action { diff --git a/projectviewer/action/NodeRenamerAction.java b/projectviewer/action/NodeRenamerAction.java index 4dc459c..d0bfbfe 100644 --- a/projectviewer/action/NodeRenamerAction.java +++ b/projectviewer/action/NodeRenamerAction.java @@ -57,7 +57,6 @@ import projectviewer.vpt.VPTDirectory; * Action for renaming files, directories and projects. * * @author Marcelo Vanzin - * @version $Id$ */ public class NodeRenamerAction extends Action { diff --git a/projectviewer/action/OpenWithAppAction.java b/projectviewer/action/OpenWithAppAction.java index 951c0f1..45727ab 100644 --- a/projectviewer/action/OpenWithAppAction.java +++ b/projectviewer/action/OpenWithAppAction.java @@ -35,7 +35,6 @@ import projectviewer.config.AppLauncher; * * @author Marcelo Vanzin * @see projectviewer.config.AppLauncher - * @version $Id$ */ public class OpenWithAppAction extends Action { diff --git a/projectviewer/action/OpenWithEncodingAction.java b/projectviewer/action/OpenWithEncodingAction.java index 5dff4a3..3534cdf 100644 --- a/projectviewer/action/OpenWithEncodingAction.java +++ b/projectviewer/action/OpenWithEncodingAction.java @@ -41,7 +41,6 @@ import projectviewer.vpt.VPTNode; * will only be available in jEdit 4.2pre5 and later. * * @author Marcelo Vanzin - * @version $Id$ */ public class OpenWithEncodingAction extends Action { diff --git a/projectviewer/action/ReimportAction.java b/projectviewer/action/ReimportAction.java index ba9c44a..4ba9b5f 100644 --- a/projectviewer/action/ReimportAction.java +++ b/projectviewer/action/ReimportAction.java @@ -33,7 +33,6 @@ import projectviewer.importer.ReImporter; * initial project importer. * * @author Marcelo Vanzin - * @version $Id$ */ public class ReimportAction extends Action { diff --git a/projectviewer/action/SearchAction.java b/projectviewer/action/SearchAction.java index 7a340dd..6cfff45 100644 --- a/projectviewer/action/SearchAction.java +++ b/projectviewer/action/SearchAction.java @@ -62,7 +62,6 @@ import projectviewer.vpt.VPTNode; * Opens the search dialog for the selected directory/project. * * @author Marcelo Vanzin - * @version $Id$ */ public class SearchAction extends Action { diff --git a/projectviewer/config/AppLauncher.java b/projectviewer/config/AppLauncher.java index 2ee47c9..1bd3554 100644 --- a/projectviewer/config/AppLauncher.java +++ b/projectviewer/config/AppLauncher.java @@ -53,7 +53,6 @@ import projectviewer.ProjectPlugin; * files, based on user-configured file name globs. * * @author Matthew Payne - * @version $Id$ */ public class AppLauncher { diff --git a/projectviewer/config/AutoReimportPane.java b/projectviewer/config/AutoReimportPane.java index 24405ff..9442daf 100644 --- a/projectviewer/config/AutoReimportPane.java +++ b/projectviewer/config/AutoReimportPane.java @@ -44,7 +44,6 @@ import projectviewer.vpt.VPTProject; * A dialog for configuring the auto-reimport feature for a project. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ class AutoReimportPane extends OptionPaneBase diff --git a/projectviewer/config/ContextOptionPane.java b/projectviewer/config/ContextOptionPane.java index 49cfea5..7118824 100644 --- a/projectviewer/config/ContextOptionPane.java +++ b/projectviewer/config/ContextOptionPane.java @@ -29,7 +29,6 @@ import org.gjt.sp.jedit.gui.AbstractContextOptionPane; * ProjectViewer context menu editor. * * @author Marcelo Vanzin - * @version $Id$ */ public class ContextOptionPane extends AbstractContextOptionPane { diff --git a/projectviewer/config/ExtensionManager.java b/projectviewer/config/ExtensionManager.java index 510c65f..1fb1083 100644 --- a/projectviewer/config/ExtensionManager.java +++ b/projectviewer/config/ExtensionManager.java @@ -39,7 +39,6 @@ import projectviewer.importer.ImporterFileFilter; * * @author Marcelo Vanzin * @since PV 3.0.0 - * @version $Id$ */ public class ExtensionManager { diff --git a/projectviewer/config/OptionsService.java b/projectviewer/config/OptionsService.java index e17f5a6..89c6050 100644 --- a/projectviewer/config/OptionsService.java +++ b/projectviewer/config/OptionsService.java @@ -30,7 +30,6 @@ import projectviewer.vpt.VPTProject; * * @author Marcelo Vanzin * @since PV 3.0.0 - * @version $Id$ */ public interface OptionsService diff --git a/projectviewer/config/ProjectAppConfigPane.java b/projectviewer/config/ProjectAppConfigPane.java index 94574a7..aa997e9 100644 --- a/projectviewer/config/ProjectAppConfigPane.java +++ b/projectviewer/config/ProjectAppConfigPane.java @@ -55,7 +55,6 @@ import projectviewer.gui.OptionPaneBase; * Option pane for the external applications configuration. * * @author Matthew Payne - * @version $Id$ */ public class ProjectAppConfigPane extends OptionPaneBase implements ActionListener { diff --git a/projectviewer/config/ProjectFilterPane.java b/projectviewer/config/ProjectFilterPane.java index 56d69c1..6b7c843 100644 --- a/projectviewer/config/ProjectFilterPane.java +++ b/projectviewer/config/ProjectFilterPane.java @@ -58,7 +58,6 @@ import projectviewer.vpt.VPTProject; * Option pane for the filter configuration. * * @author Rudolf Widmann, reused code from Matthew Payne - * @version $Id$ */ public class ProjectFilterPane extends OptionPaneBase implements ActionListener diff --git a/projectviewer/config/ProjectOptions.java b/projectviewer/config/ProjectOptions.java index da79b8a..3a43564 100644 --- a/projectviewer/config/ProjectOptions.java +++ b/projectviewer/config/ProjectOptions.java @@ -42,7 +42,6 @@ import projectviewer.vpt.VPTProject; * plugins to add option panes to it. * * @author Marcelo Vanzin - * @version $Id$ */ public class ProjectOptions { diff --git a/projectviewer/config/ProjectViewerOptionsPane.java b/projectviewer/config/ProjectViewerOptionsPane.java index 65a1262..5871e3f 100644 --- a/projectviewer/config/ProjectViewerOptionsPane.java +++ b/projectviewer/config/ProjectViewerOptionsPane.java @@ -45,7 +45,6 @@ import projectviewer.gui.OptionPaneBase; * <p>Option pane to configure the ProjectViewer plugin.</p> * * @author Marcelo Vanzin - * @version $Id$ */ public class ProjectViewerOptionsPane extends OptionPaneBase implements ActionListener { diff --git a/projectviewer/config/VersionControlService.java b/projectviewer/config/VersionControlService.java index 286275b..247fa83 100644 --- a/projectviewer/config/VersionControlService.java +++ b/projectviewer/config/VersionControlService.java @@ -37,7 +37,6 @@ import projectviewer.vpt.VPTProject; * * @author Marcelo Vanzin * @since PV 3.0.0 - * @version $Id$ */ public interface VersionControlService extends OptionsService diff --git a/projectviewer/event/NodeSelectionUpdate.java b/projectviewer/event/NodeSelectionUpdate.java index fc60e4c..b00562f 100644 --- a/projectviewer/event/NodeSelectionUpdate.java +++ b/projectviewer/event/NodeSelectionUpdate.java @@ -29,7 +29,6 @@ import projectviewer.vpt.VPTNode; * An update that notifies that a node in the tree has been selected. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public final class NodeSelectionUpdate extends VFSPathSelected diff --git a/projectviewer/event/ProjectUpdate.java b/projectviewer/event/ProjectUpdate.java index 9ee2c18..b3ba694 100644 --- a/projectviewer/event/ProjectUpdate.java +++ b/projectviewer/event/ProjectUpdate.java @@ -27,7 +27,6 @@ import projectviewer.vpt.VPTProject; * A project update message sent on the Edit Bus. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public final class ProjectUpdate extends EBMessage diff --git a/projectviewer/event/StructureUpdate.java b/projectviewer/event/StructureUpdate.java index f9b6fff..247b334 100644 --- a/projectviewer/event/StructureUpdate.java +++ b/projectviewer/event/StructureUpdate.java @@ -29,7 +29,6 @@ import projectviewer.vpt.VPTNode; * the plugin. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public final class StructureUpdate extends EBMessage diff --git a/projectviewer/event/ViewerUpdate.java b/projectviewer/event/ViewerUpdate.java index 9f7f7e9..813821f 100644 --- a/projectviewer/event/ViewerUpdate.java +++ b/projectviewer/event/ViewerUpdate.java @@ -29,7 +29,6 @@ import projectviewer.vpt.VPTNode; * A project viewer update message sent on the Edit Bus. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public final class ViewerUpdate extends EBMessage @@ -98,7 +97,7 @@ public final class ViewerUpdate extends EBMessage public VPTNode getNode() { return node; } - + /** * Returns the view where the event occurred. */ diff --git a/projectviewer/gui/GeneralNodeProperties.java b/projectviewer/gui/GeneralNodeProperties.java index ab2fd27..586d20d 100644 --- a/projectviewer/gui/GeneralNodeProperties.java +++ b/projectviewer/gui/GeneralNodeProperties.java @@ -54,7 +54,6 @@ import projectviewer.vpt.VPTProject; * and VFS nodes. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ class GeneralNodeProperties implements NodePropertyProvider diff --git a/projectviewer/gui/GroupMenu.java b/projectviewer/gui/GroupMenu.java index 215e969..7a2fe99 100644 --- a/projectviewer/gui/GroupMenu.java +++ b/projectviewer/gui/GroupMenu.java @@ -53,7 +53,6 @@ import projectviewer.vpt.VPTRoot; * class does not take care of that automatically.</p> * * @author Marcelo Vanzin - * @version $Id$ * @since PV 2.1.0 */ public class GroupMenu extends JMenu implements ActionListener { diff --git a/projectviewer/gui/ImportDialog.java b/projectviewer/gui/ImportDialog.java index eee6fda..7f1ef8c 100644 --- a/projectviewer/gui/ImportDialog.java +++ b/projectviewer/gui/ImportDialog.java @@ -77,7 +77,6 @@ import projectviewer.vpt.VPTProject; * in the importer classes, and to provide some extra flexibility.</p> * * @author Marcelo Vanzin - * @version $Id$ * @since PV 2.1.1 */ public class ImportDialog extends EnhancedDialog diff --git a/projectviewer/gui/NodePropertiesDialog.java b/projectviewer/gui/NodePropertiesDialog.java index 1042266..bcee886 100644 --- a/projectviewer/gui/NodePropertiesDialog.java +++ b/projectviewer/gui/NodePropertiesDialog.java @@ -49,7 +49,6 @@ import projectviewer.vpt.VPTNode; * of "NodePropertyProvider" through the jEdit services mechanism. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public class NodePropertiesDialog extends EnhancedDialog diff --git a/projectviewer/gui/NodePropertyProvider.java b/projectviewer/gui/NodePropertyProvider.java index 1394bc6..77b1e02 100644 --- a/projectviewer/gui/NodePropertyProvider.java +++ b/projectviewer/gui/NodePropertyProvider.java @@ -27,7 +27,6 @@ import projectviewer.vpt.VPTNode; * for each available provider. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public interface NodePropertyProvider diff --git a/projectviewer/gui/OptionPaneBase.java b/projectviewer/gui/OptionPaneBase.java index d51ce6b..5d9e7ba 100644 --- a/projectviewer/gui/OptionPaneBase.java +++ b/projectviewer/gui/OptionPaneBase.java @@ -32,7 +32,6 @@ import org.gjt.sp.jedit.AbstractOptionPane; * A base class for option panes that makes some common tasks easier. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public abstract class OptionPaneBase extends AbstractOptionPane diff --git a/projectviewer/gui/ProjectComboBox.java b/projectviewer/gui/ProjectComboBox.java index d8a3030..b1e76b4 100644 --- a/projectviewer/gui/ProjectComboBox.java +++ b/projectviewer/gui/ProjectComboBox.java @@ -57,7 +57,6 @@ import projectviewer.vpt.VPTRoot; * JComboBox popup menu, which is the optimal solution to this.</p> * * @author Marcelo Vanzin - * @version $Id$ * @since PV 2.1.0 */ public class ProjectComboBox extends JButton diff --git a/projectviewer/importer/AutoReimporter.java b/projectviewer/importer/AutoReimporter.java index 557ac77..ebf4d40 100644 --- a/projectviewer/importer/AutoReimporter.java +++ b/projectviewer/importer/AutoReimporter.java @@ -47,7 +47,6 @@ import projectviewer.vpt.VPTProject; * A timer task for triggering auto-reimport of projects. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public class AutoReimporter implements ActionListener diff --git a/projectviewer/importer/CVSEntriesFilter.java b/projectviewer/importer/CVSEntriesFilter.java index 90ab127..b0b7910 100644 --- a/projectviewer/importer/CVSEntriesFilter.java +++ b/projectviewer/importer/CVSEntriesFilter.java @@ -67,7 +67,6 @@ import projectviewer.VFSHelper; * they're available.</p> * * @author Marcelo Vanzin - * @version $Id$ */ public class CVSEntriesFilter extends ImporterFileFilter { diff --git a/projectviewer/importer/FileImporter.java b/projectviewer/importer/FileImporter.java index 3dd1148..0092ff1 100644 --- a/projectviewer/importer/FileImporter.java +++ b/projectviewer/importer/FileImporter.java @@ -49,7 +49,6 @@ import projectviewer.vpt.VPTDirectory; * Imports files and/or directories into a project. * * @author Marcelo Vanzin - * @version $Id$ */ public class FileImporter extends Importer { diff --git a/projectviewer/importer/GlobFilter.java b/projectviewer/importer/GlobFilter.java index 1cadc4c..61d8ce9 100644 --- a/projectviewer/importer/GlobFilter.java +++ b/projectviewer/importer/GlobFilter.java @@ -40,7 +40,6 @@ import projectviewer.config.ProjectViewerConfig; * to select the files. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 2.1.1 */ public final class GlobFilter extends ImporterFileFilter { diff --git a/projectviewer/importer/ImportUtils.java b/projectviewer/importer/ImportUtils.java index 4e230d8..c0acc5f 100644 --- a/projectviewer/importer/ImportUtils.java +++ b/projectviewer/importer/ImportUtils.java @@ -34,7 +34,6 @@ import projectviewer.vpt.VPTProject; * files. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public final class ImportUtils diff --git a/projectviewer/importer/Importer.java b/projectviewer/importer/Importer.java index ec9147e..f31c7c7 100644 --- a/projectviewer/importer/Importer.java +++ b/projectviewer/importer/Importer.java @@ -73,7 +73,6 @@ import projectviewer.VFSHelper; * during the import phase (but the rest of jEdit will be usable).</p> * * @author Marcelo Vanzin - * @version $Id$ */ public abstract class Importer implements Runnable { diff --git a/projectviewer/importer/ImporterFileFilter.java b/projectviewer/importer/ImporterFileFilter.java index c3afcbb..4cab5a8 100644 --- a/projectviewer/importer/ImporterFileFilter.java +++ b/projectviewer/importer/ImporterFileFilter.java @@ -36,7 +36,6 @@ import org.gjt.sp.jedit.io.VFSManager; * It provides some PV-specific extensions to the jEdit filter interface. * * @author Marcelo Vanzin - * @version $Id$ */ public abstract class ImporterFileFilter implements VFSFileFilter { diff --git a/projectviewer/importer/NewFileImporter.java b/projectviewer/importer/NewFileImporter.java index 54e0244..ecab71b 100644 --- a/projectviewer/importer/NewFileImporter.java +++ b/projectviewer/importer/NewFileImporter.java @@ -38,7 +38,6 @@ import projectviewer.vpt.VPTFile; * given file. Do not use it for other types of imports. * * @author Marcelo Vanzin - * @version $Id$ */ public class NewFileImporter extends Importer { diff --git a/projectviewer/importer/NonProjectFileFilter.java b/projectviewer/importer/NonProjectFileFilter.java index a579770..a7c804d 100644 --- a/projectviewer/importer/NonProjectFileFilter.java +++ b/projectviewer/importer/NonProjectFileFilter.java @@ -28,7 +28,6 @@ import projectviewer.vpt.VPTProject; * A FileFilter that filters out files already added to the project. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 2.1.1 (was a protected inner class in FileImporter before this) */ public class NonProjectFileFilter extends ImporterFileFilter { diff --git a/projectviewer/importer/ReImporter.java b/projectviewer/importer/ReImporter.java index 922e147..d25509f 100644 --- a/projectviewer/importer/ReImporter.java +++ b/projectviewer/importer/ReImporter.java @@ -48,7 +48,6 @@ import projectviewer.vpt.VPTDirectory; * to re-import the directory. These actions take place recursively. * * @author Marcelo Vanzin - * @version $Id$ */ public class ReImporter extends RootImporter { diff --git a/projectviewer/importer/RootImporter.java b/projectviewer/importer/RootImporter.java index 1010f9c..90aff15 100644 --- a/projectviewer/importer/RootImporter.java +++ b/projectviewer/importer/RootImporter.java @@ -44,7 +44,6 @@ import projectviewer.vpt.VPTDirectory; * remove all existing files under the root before doing a fresh import. * * @author Marcelo Vanzin - * @version $Id$ */ public class RootImporter extends FileImporter { diff --git a/projectviewer/persist/DirectoryNodeHandler.java b/projectviewer/persist/DirectoryNodeHandler.java index bfd4def..17be192 100644 --- a/projectviewer/persist/DirectoryNodeHandler.java +++ b/projectviewer/persist/DirectoryNodeHandler.java @@ -33,7 +33,6 @@ import projectviewer.vpt.VPTDirectory; * Handler for directory nodes. * * @author Marcelo Vanzin - * @version $Id$ */ public class DirectoryNodeHandler extends NodeHandler { diff --git a/projectviewer/persist/FileNodeHandler.java b/projectviewer/persist/FileNodeHandler.java index c516a3f..7b89bc3 100644 --- a/projectviewer/persist/FileNodeHandler.java +++ b/projectviewer/persist/FileNodeHandler.java @@ -38,7 +38,6 @@ import projectviewer.config.ProjectViewerConfig; * Handler for file nodes. * * @author Marcelo Vanzin - * @version $Id$ */ public class FileNodeHandler extends NodeHandler { diff --git a/projectviewer/persist/FilterNodeHandler.java b/projectviewer/persist/FilterNodeHandler.java index 65e5bff..7b2d5d2 100644 --- a/projectviewer/persist/FilterNodeHandler.java +++ b/projectviewer/persist/FilterNodeHandler.java @@ -31,7 +31,6 @@ import projectviewer.vpt.VPTProject; * Handler for filter configuration nodes. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public class FilterNodeHandler extends NodeHandler diff --git a/projectviewer/persist/NodeHandler.java b/projectviewer/persist/NodeHandler.java index 135c235..cf13eca 100644 --- a/projectviewer/persist/NodeHandler.java +++ b/projectviewer/persist/NodeHandler.java @@ -50,7 +50,6 @@ import projectviewer.vpt.VPTProject; * found, the appropriate handler callback method will be called. * * @author Marcelo Vanzin - * @version $Id$ */ public abstract class NodeHandler { diff --git a/projectviewer/persist/OldConfigLoader.java b/projectviewer/persist/OldConfigLoader.java index b8c9a03..686ca4e 100644 --- a/projectviewer/persist/OldConfigLoader.java +++ b/projectviewer/persist/OldConfigLoader.java @@ -48,7 +48,6 @@ import projectviewer.ProjectManager; * to worry about saving in the old format. * * @author Marcelo Vanzin - * @version $Id$ */ public final class OldConfigLoader { diff --git a/projectviewer/persist/OpenFileNodeHandler.java b/projectviewer/persist/OpenFileNodeHandler.java index b484232..5670f15 100644 --- a/projectviewer/persist/OpenFileNodeHandler.java +++ b/projectviewer/persist/OpenFileNodeHandler.java @@ -31,7 +31,6 @@ import projectviewer.vpt.VPTProject; * Handler for open file nodes. * * @author Marcelo Vanzin - * @version $Id$ */ public class OpenFileNodeHandler extends NodeHandler { diff --git a/projectviewer/persist/ProjectNodeHandler.java b/projectviewer/persist/ProjectNodeHandler.java index 8927fe2..cffe62e 100644 --- a/projectviewer/persist/ProjectNodeHandler.java +++ b/projectviewer/persist/ProjectNodeHandler.java @@ -34,7 +34,6 @@ import projectviewer.vpt.VPTProject; * Handler for project nodes. * * @author Marcelo Vanzin - * @version $Id$ */ public class ProjectNodeHandler extends NodeHandler { diff --git a/projectviewer/persist/ProjectPersistenceManager.java b/projectviewer/persist/ProjectPersistenceManager.java index db58707..44b83e0 100644 --- a/projectviewer/persist/ProjectPersistenceManager.java +++ b/projectviewer/persist/ProjectPersistenceManager.java @@ -65,7 +65,6 @@ import projectviewer.config.ProjectViewerConfig; * own config file, that is loaded when the project is activated. * * @author Marcelo Vanzin - * @version $Id$ */ public final class ProjectPersistenceManager { diff --git a/projectviewer/persist/ProjectZipper.java b/projectviewer/persist/ProjectZipper.java index 16728c7..65dc4e8 100644 --- a/projectviewer/persist/ProjectZipper.java +++ b/projectviewer/persist/ProjectZipper.java @@ -74,7 +74,6 @@ import projectviewer.PVActions; * * @author Alex Levin * @author Marcelo Vanzin - * @version $Id$ */ public class ProjectZipper extends EnhancedDialog implements ActionListener { diff --git a/projectviewer/persist/PropertyNodeHandler.java b/projectviewer/persist/PropertyNodeHandler.java index 7069bb3..fd1fc0a 100644 --- a/projectviewer/persist/PropertyNodeHandler.java +++ b/projectviewer/persist/PropertyNodeHandler.java @@ -33,7 +33,6 @@ import projectviewer.vpt.VPTProject; * Handler for property nodes. * * @author Marcelo Vanzin - * @version $Id$ */ public class PropertyNodeHandler extends NodeHandler { diff --git a/projectviewer/vpt/IconComposer.java b/projectviewer/vpt/IconComposer.java index 232606a..9994796 100644 --- a/projectviewer/vpt/IconComposer.java +++ b/projectviewer/vpt/IconComposer.java @@ -49,7 +49,6 @@ import projectviewer.config.VersionControlService; * Create decorated icons for VPT nodes * * @author Stefan Kost - * @version $Id$ */ public final class IconComposer { diff --git a/projectviewer/vpt/ProjectCustomTreeModel.java b/projectviewer/vpt/ProjectCustomTreeModel.java index 4d845b9..5144957 100644 --- a/projectviewer/vpt/ProjectCustomTreeModel.java +++ b/projectviewer/vpt/ProjectCustomTreeModel.java @@ -35,7 +35,6 @@ import javax.swing.tree.TreeNode; * for these trees. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public abstract class ProjectCustomTreeModel extends ProjectTreeModel diff --git a/projectviewer/vpt/ProjectTreeModel.java b/projectviewer/vpt/ProjectTreeModel.java index 8c0fe1c..59e6cb5 100644 --- a/projectviewer/vpt/ProjectTreeModel.java +++ b/projectviewer/vpt/ProjectTreeModel.java @@ -25,7 +25,6 @@ import javax.swing.tree.DefaultTreeModel; * ProjectViewer. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public abstract class ProjectTreeModel extends DefaultTreeModel diff --git a/projectviewer/vpt/ProjectTreePanel.java b/projectviewer/vpt/ProjectTreePanel.java index 8e9f8d5..e8aadf1 100644 --- a/projectviewer/vpt/ProjectTreePanel.java +++ b/projectviewer/vpt/ProjectTreePanel.java @@ -73,7 +73,6 @@ import projectviewer.config.VersionControlService; * trees. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ public class ProjectTreePanel extends JPanel diff --git a/projectviewer/vpt/VPTCellRenderer.java b/projectviewer/vpt/VPTCellRenderer.java index 07750c4..bc21199 100644 --- a/projectviewer/vpt/VPTCellRenderer.java +++ b/projectviewer/vpt/VPTCellRenderer.java @@ -39,7 +39,6 @@ import projectviewer.PVActions; * * @author <A HREF="mailto:bu...@re...">Kevin A. Burton</A> * @author Marcelo Vanzin - * @version $Id$ */ public final class VPTCellRenderer extends DefaultTreeCellRenderer { diff --git a/projectviewer/vpt/VPTCompactModel.java b/projectviewer/vpt/VPTCompactModel.java index 799335b..35ac60f 100644 --- a/projectviewer/vpt/VPTCompactModel.java +++ b/projectviewer/vpt/VPTCompactModel.java @@ -47,7 +47,6 @@ import org.gjt.sp.util.Log; * </table> * * @author francisdobi - * @version $Id$ * @since PV 2.1.0 */ public class VPTCompactModel extends ProjectCustomTreeModel diff --git a/projectviewer/vpt/VPTContextMenu.java b/projectviewer/vpt/VPTContextMenu.java index fe1fed7..5af827e 100644 --- a/projectviewer/vpt/VPTContextMenu.java +++ b/projectviewer/vpt/VPTContextMenu.java @@ -62,7 +62,6 @@ import projectviewer.config.ProjectViewerConfig; * functionality. * * @author Marcelo Vanzin - * @version $Id$ */ public class VPTContextMenu extends MouseAdapter implements ExtensionManager.ManagedService diff --git a/projectviewer/vpt/VPTDirectory.java b/projectviewer/vpt/VPTDirectory.java index 0d10857..4322770 100644 --- a/projectviewer/vpt/VPTDirectory.java +++ b/projectviewer/vpt/VPTDirectory.java @@ -35,7 +35,6 @@ import projectviewer.VFSHelper; * Models a directory that is part of a project. * * @author Marcelo Vanzin - * @version $Id$ */ public class VPTDirectory extends VPTNode { diff --git a/projectviewer/vpt/VPTFile.java b/projectviewer/vpt/VPTFile.java index 9ce2886..7c9cbf0 100644 --- a/projectviewer/vpt/VPTFile.java +++ b/projectviewer/vpt/VPTFile.java @@ -52,7 +52,6 @@ import projectviewer.config.ProjectViewerConfig; * Models a file that is part of a project. * * @author Marcelo Vanzin - * @version $Id$ */ public class VPTFile extends VPTNode { diff --git a/projectviewer/vpt/VPTFileListModel.java b/projectviewer/vpt/VPTFileListModel.java index 1c0521d..fefb47d 100644 --- a/projectviewer/vpt/VPTFileListModel.java +++ b/projectviewer/vpt/VPTFileListModel.java @@ -26,7 +26,6 @@ import java.util.List; * to the nodes they are a child of. * * @author Marcelo Vanzin - * @version $Id$ */ public class VPTFileListModel extends ProjectCustomTreeModel { diff --git a/projectviewer/vpt/VPTFilterData.java b/projectviewer/vpt/VPTFilterData.java index 219d6f7..9bf969a 100644 --- a/projectviewer/vpt/VPTFilterData.java +++ b/projectviewer/vpt/VPTFilterData.java @@ -24,7 +24,6 @@ import org.gjt.sp.util.StandardUtilities; /* * @author Rudolf Widmann - * @version $Id$ * @since PV 2.2.0.0 */ public class VPTFilterData implements Serializable { diff --git a/projectviewer/vpt/VPTFilteredModel.java b/projectviewer/vpt/VPTFilteredModel.java index cb1d40d..39b16ec 100644 --- a/projectviewer/vpt/VPTFilteredModel.java +++ b/projectviewer/vpt/VPTFilteredModel.java @@ -34,7 +34,6 @@ import projectviewer.ProjectManager; * filters. * * @author Rudolf Widmann - * @version $Id$ * @since PV 2.2.0.0 */ public class VPTFilteredModel extends ProjectCustomTreeModel @@ -180,7 +179,7 @@ public class VPTFilteredModel extends ProjectCustomTreeModel { return VPTCellRenderer.CLIP_START; } - + public int compareTo(VPTNode node) { if (node instanceof FilteredDirectoryNode) { diff --git a/projectviewer/vpt/VPTFoldersTreeModel.java b/projectviewer/vpt/VPTFoldersTreeModel.java index bcda831..4caee57 100644 --- a/projectviewer/vpt/VPTFoldersTreeModel.java +++ b/projectviewer/vpt/VPTFoldersTreeModel.java @@ -22,7 +22,6 @@ package projectviewer.vpt; * The folders tree. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 3.0.0 */ class VPTFoldersTreeModel extends ProjectTreeModel diff --git a/projectviewer/vpt/VPTGroup.java b/projectviewer/vpt/VPTGroup.java index e19e244..3a89224 100644 --- a/projectviewer/vpt/VPTGroup.java +++ b/projectviewer/vpt/VPTGroup.java @@ -31,7 +31,6 @@ import org.gjt.sp.jedit.GUIUtilities; * A VPTGroup is a container for groups and projects. * * @author Marcelo Vanzin - * @version $Id$ * @since PV 2.1.0 */ public class VPTGroup extends VPTNode { diff --git a/projectviewer/vpt/VPTNode.java b/projectviewer/vpt/VPTNode.java index 3a5546c..7233a5c 100644 --- a/projectviewer/vpt/VPTNode.java +++ b/projectviewer/vpt/VPTNode.java @@ -43,7 +43,6 @@ import projectviewer.config.ProjectViewerConfig; * plugin by Shad Stafford.</p> * * @author Marcelo Vanzin - * @version $Id$ */ public abstract class VPTNode extends DefaultMutableTreeNode implements Comparable<VPTNode> diff --git a/projectviewer/vpt/VPTProject.java b/projectviewer/vpt/VPTProject.java index 4bae0b1..c8171d9 100644 --- a/projectviewer/vpt/VPTProject.java +++ b/projectviewer/vpt/VPTProject.java @@ -49,7 +49,6 @@ import projectviewer.event.ProjectUpdate; * <p>Note: this class is not thread safe!</p> * * @author Marcelo Vanzin - * @version $Id$ */ public class VPTProject extends VPTNode { diff --git a/projectviewer/vpt/VPTRoot.java b/projectviewer/vpt/VPTRoot.java index ee1925b..420a747 100644 --- a/projectviewer/vpt/VPTRoot.java +++ b/projectviewer/vpt/VPTRoot.java @@ -30,7 +30,6 @@ import org.gjt.sp.jedit.jEdit; * to the disk. * * @author Marcelo Vanzin - * @version $Id$ */ public class VPTRoot extends VPTGroup { diff --git a/projectviewer/vpt/VPTSelectionListener.java b/projectviewer/vpt/VPTSelectionListener.java index 4673da8..d352af1 100644 --- a/projectviewer/vpt/VPTSelectionListener.java +++ b/projectviewer/vpt/VPTSelectionListener.java @@ -40,7 +40,6 @@ import projectviewer.event.NodeSelectionUpdate; * * @author <A HREF="mailto:bu...@re...">Kevin A. Burton</A> * @author Marcelo Vanzin - * @version $Id$ */ public final class VPTSelectionListener implements TreeSelectionListener, MouseListener { diff --git a/projectviewer/vpt/VPTWorkingFileListModel.java b/projectviewer/vpt/VPTWorkingFileListModel.java index 0d99567..db3778e 100644 --- a/projectviewer/vpt/VPTWorkingFileListModel.java +++ b/projectviewer/vpt/VPTWorkingFileListModel.java @@ -40,7 +40,6 @@ import projectviewer.config.ProjectViewerConfig; * A tree model that shows all files currently opened in jEdit in a flat list. * * @author Marcelo Vanzin - * @version $Id$ */ public class VPTWorkingFileListModel extends ProjectCustomTreeModel { diff --git a/pvdebug/DummyAction.java b/pvdebug/DummyAction.java index b30f86a..fb47f1e 100644 --- a/pvdebug/DummyAction.java +++ b/pvdebug/DummyAction.java @@ -37,7 +37,6 @@ import projectviewer.config.ProjectOptions; * An action to be used for debugging purposes. * * @author Marcelo Vanzin - * @version $Id$ */ public class DummyAction extends Action { diff --git a/pvdebug/DummyOptionPane.java b/pvdebug/DummyOptionPane.java index 6ed7cd3..cb11eab 100644 --- a/pvdebug/DummyOptionPane.java +++ b/pvdebug/DummyOptionPane.java @@ -35,7 +35,6 @@ import org.gjt.sp.jedit.AbstractOptionPane; * An option pane to be used for debugging purposes. * * @author Marcelo Vanzin - * @version $Id$ */ public class DummyOptionPane extends AbstractOptionPane { diff --git a/pvdebug/DummyOptions.java b/pvdebug/DummyOptions.java index 66fb84c..13ec2f8 100644 --- a/pvdebug/DummyOptions.java +++ b/pvdebug/DummyOptions.java @@ -35,7 +35,6 @@ import projectviewer.vpt.VPTProject; * A dummy version control service. * * @author Marcelo Vanzin - * @version $Id$ */ public class DummyOptions implements OptionsService { diff --git a/pvdebug/DummyProperty.java b/pvdebug/DummyProperty.java index 386a925..015a015 100644 --- a/pvdebug/DummyProperty.java +++ b/pvdebug/DummyProperty.java @@ -22,15 +22,14 @@ package pvdebug; * A dumb object for testing property serialization. * * @author Marcelo Vanzin - * @version $Id$ */ public class DummyProperty implements java.io.Serializable { private String value = "dummy_property_4567890"; - + public String toString() { return value; } - + } diff --git a/pvdebug/DummyVC.java b/pvdebug/DummyVC.java index 723e7ac..49f8791 100644 --- a/pvdebug/DummyVC.java +++ b/pvdebug/DummyVC.java @@ -34,7 +34,6 @@ import projectviewer.vpt.VPTProject; * A dummy version control service. * * @author Marcelo Vanzin - * @version $Id$ */ public class DummyVC implements VersionControlService { diff --git a/pvdebug/PVDebugPlugin.java b/pvdebug/PVDebugPlugin.java index 7acdcd2..674782b 100644 --- a/pvdebug/PVDebugPlugin.java +++ b/pvdebug/PVDebugPlugin.java @@ -36,7 +36,6 @@ import projectviewer.vpt.VPTFile; * A debug plugin for ProjectViewer. * * @author Marcelo Vanzin - * @version $Id$ */ public final class PVDebugPlugin extends EBPlugin { commit f1812481fba587064e91071d79298b403dc2ad95 Author: Marcelo Vanzin <va...@us...> Date: Sat Apr 3 14:25:29 2010 -0700 Minor coding style updates. diff --git a/docs/CODING_STYLE b/docs/CODING_STYLE index 07e1d93..770c203 100644 --- a/docs/CODING_STYLE +++ b/docs/CODING_STYLE @@ -74,9 +74,9 @@ but it's good to write them, so other people reading your code can understand more easily what's going on. Don't forget to make it clear when parameters or return values may be null. -Always write a Javadoc comment for your classes, and include the "@author" and -"@version" tags. In the "@version" tag, put the CVS keyword "Id" (using "$" -instead of the quotes). Other tags are optional, and may be included at will. +Always write a Javadoc comment for your classes, and include an "@author" tags, +and "@since" tag when approppriate. Other tags are optional, and may be +included at will. Sometimes, packages may have some functionality that needs some explaining for outside developers. In such cases, write a "package.html" file explaining the @@ -99,7 +99,9 @@ to the TODO file. Just to reinforce, always use the Java convention of naming classes and methods: classes always start with a capital letter, and words are capitalized in the middle of the name (e.g., "MyClass"). Methods always start with lower case -letters, and are also capitalized (e.g., "myMethod"). Try to name classes as NOUNS, and methods as VERBS, and try to make the words as descriptive as possible. +letters, and are also capitalized (e.g., "myMethod"). Try to name classes as +NOUNS, and methods as VERBS, and try to make the words as descriptive as +possible. Also, try to keep the code organized in packages. Do not polute the top level "projectviewer" package with classes that would be better situated in the @@ -138,5 +140,8 @@ information when reporting bugs. -------------------------------------------------------------------------------- (vii) Dependencies -Try not to add extra dependencies (plugins, libraries) to ProjectViewer. Also, try to target the Java 1.4 runtime. When considering a 1.5-specific feature, check if it is absolutely necessary to use the 1.5 methods, and if so, if it's possible to maintain compatibility with the 1.4 runtime (for example, by detecting the version of the JRE being used). +Try not to add extra dependencies (plugins, libraries) to ProjectViewer. +Optimally, the only hard dependency should be on the CommonControls plugin. +If adding a dependency on another plugin, try to make it optional, following +the pattern used with the ErrorList and InfoViewer cases. ----------------------------------------------------------------------- Summary of changes: dockables.xml | 4 -- docs/CHANGELOG | 2 - docs/CODING_STYLE | 15 ++++-- projectviewer/PVActions.java | 1 - projectviewer/PVMenuProvider.java | 1 - projectviewer/ProjectManager.java | 1 - projectviewer/ProjectViewer.java | 1 - projectviewer/VFSHelper.java | 4 +- projectviewer/action/Action.java | 1 - projectviewer/action/ActionSeparator.java | 1 - projectviewer/action/ArchiveAction.java | 1 - projectviewer/action/CollapseAllAction.java | 1 - projectviewer/action/EditGroupAction.java | 1 - projectviewer/action/EditProjectAction.java | 1 - projectviewer/action/ExpandAllAction.java | 1 - projectviewer/action/FileImportAction.java | 1 - projectviewer/action/LaunchBrowserAction.java | 1 - projectviewer/action/MoveNodeAction.java | 1 - projectviewer/action/NodePropertiesAction.java | 1 - projectviewer/action/NodeRemoverAction.java | 1 - projectviewer/action/NodeRenamerAction.java | 1 - projectviewer/action/OpenWithAppAction.java | 1 - projectviewer/action/OpenWithEncodingAction.java | 1 - projectviewer/action/ReimportAction.java | 1 - projectviewer/action/SearchAction.java | 1 - projectviewer/config/AppLauncher.java | 1 - projectviewer/config/AutoReimportPane.java | 1 - projectviewer/config/ContextOptionPane.java | 1 - projectviewer/config/ExtensionManager.java | 1 - projectviewer/config/OptionsService.java | 1 - projectviewer/config/ProjectAppConfigPane.java | 1 - projectviewer/config/ProjectFilterPane.java | 1 - projectviewer/config/ProjectOptions.java | 1 - projectviewer/config/ProjectViewerOptionsPane.java | 1 - projectviewer/config/VersionControlService.java | 1 - projectviewer/event/NodeSelectionUpdate.java | 1 - projectviewer/event/ProjectUpdate.java | 1 - projectviewer/event/StructureUpdate.java | 1 - projectviewer/event/ViewerUpdate.java | 3 +- projectviewer/gui/GeneralNodeProperties.java | 1 - projectviewer/gui/GroupMenu.java | 1 - projectviewer/gui/ImportDialog.java | 1 - projectviewer/gui/NodePropertiesDialog.java | 1 - projectviewer/gui/NodePropertyProvider.java | 1 - projectviewer/gui/OptionPaneBase.java | 1 - projectviewer/gui/ProjectComboBox.java | 48 ++++++++++--------- projectviewer/importer/AutoReimporter.java | 1 - projectviewer/importer/CVSEntriesFilter.java | 1 - projectviewer/importer/FileImporter.java | 1 - projectviewer/importer/GlobFilter.java | 1 - projectviewer/importer/ImportUtils.java | 1 - projectviewer/importer/Importer.java | 1 - projectviewer/importer/ImporterFileFilter.java | 1 - projectviewer/importer/NewFileImporter.java | 1 - projectviewer/importer/NonProjectFileFilter.java | 1 - projectviewer/importer/ReImporter.java | 1 - projectviewer/importer/RootImporter.java | 1 - projectviewer/persist/DirectoryNodeHandler.java | 1 - projectviewer/persist/FileNodeHandler.java | 1 - projectviewer/persist/FilterNodeHandler.java | 1 - projectviewer/persist/NodeHandler.java | 1 - projectviewer/persist/OldConfigLoader.java | 1 - projectviewer/persist/OpenFileNodeHandler.java | 1 - projectviewer/persist/ProjectNodeHandler.java | 1 - .../persist/ProjectPersistenceManager.java | 1 - projectviewer/persist/ProjectZipper.java | 1 - projectviewer/persist/PropertyNodeHandler.java | 1 - projectviewer/vpt/IconComposer.java | 1 - projectviewer/vpt/ProjectCustomTreeModel.java | 1 - projectviewer/vpt/ProjectTreeModel.java | 1 - projectviewer/vpt/ProjectTreePanel.java | 1 - projectviewer/vpt/VPTCellRenderer.java | 1 - projectviewer/vpt/VPTCompactModel.java | 1 - projectviewer/vpt/VPTContextMenu.java | 1 - projectviewer/vpt/VPTDirectory.java | 1 - projectviewer/vpt/VPTFile.java | 6 ++- projectviewer/vpt/VPTFileListModel.java | 1 - projectviewer/vpt/VPTFilterData.java | 1 - projectviewer/vpt/VPTFilteredModel.java | 3 +- projectviewer/vpt/VPTFoldersTreeModel.java | 1 - projectviewer/vpt/VPTGroup.java | 1 - projectviewer/vpt/VPTNode.java | 1 - projectviewer/vpt/VPTProject.java | 1 - projectviewer/vpt/VPTRoot.java | 1 - projectviewer/vpt/VPTSelectionListener.java | 1 - projectviewer/vpt/VPTWorkingFileListModel.java | 1 - pvdebug/DummyAction.java | 1 - pvdebug/DummyOptionPane.java | 1 - pvdebug/DummyOptions.java | 1 - pvdebug/DummyProperty.java | 5 +- pvdebug/DummyVC.java | 1 - pvdebug/PVDebugPlugin.java | 1 - 92 files changed, 45 insertions(+), 128 deletions(-) hooks/post-receive -- ProjectViewer jEdit plugin |