This series adds support for customizable label decorations, which
is usefull for hiding selected decorations, or tweaking the format
of the decoration text.
Decorations are edited using the new Team->Git->Label Decorations
preference page, which is based off similar functionality from the
existing CVS and SVN team providers.
Icons can be enabled and disabled individually, and text can be
customized by reordering and editing the set of mapped variables.
Boolean variables like 'dirty' and 'staged' can be customized by
postfixing the variable name with a colon and a selected string
that should be insert if the variable evaluates to true.
The two general options control traversal of child and parent
elements during decoration. The first, 'Also re-decorate...',
controls whether or not ancestor elements of the current decorated
elment will also be scheduled for re-recoration. The second,
'Inspect dirty state...', controls whether decoration of container
elements such as projects and folders should traverse child elements
to decide if the container is dirty.
Disabling these options will improve performance for large trees.
The code should be solid enough for normal use, but I may have
missed situations that the code does not handle -- resuling in
crash and burn. If so, please let me know.
Known issues are:
- If a project has a repository more than one level above the
project directory decorations will fail.
- When a Java resource is dirty, each parent package in the
package hierarcy will appear dirty, even when the layout is
set to 'flat'.
I've sprinkled the code with TODOs where I found possible future
improvments. One such improvment is performance, where for example
refactoring to use one shared status cache should help.
Tor Arne
PS: This is my first major patch to EGit, so apologies in advance
if I messed up the steps of the submit process in any way :)
Tor Arne Vestbø (11):
Add support code to handle plugin property changes
Use Set instead of array to keep track of change listeners
Add a specialized team exception for Git
Add new class ExceptionCollector for grouping exceptions
Add new class SWTUtils with helper-methods for creating controls
Implement basic customizable label decorations with preferences
Add binding for name of the current branch
Add icon decoration for tracked and untracked resources
Implement decorations of dirty, staged, and conflicting resources
Don't decorate every single resource on repository change
Implement label decorations for folders and projects
org.spearce.egit.core/META-INF/MANIFEST.MF | 5 +-
.../src/org/spearce/egit/core/GitException.java | 168 +++
.../core/internal/util/ExceptionCollector.java | 128 +++
.../spearce/egit/core/project/GitProjectData.java | 33 +-
org.spearce.egit.ui/.options | 8 +-
org.spearce.egit.ui/icons/ovr/assumevalid.gif | Bin 64 -> 0 bytes
org.spearce.egit.ui/icons/ovr/conflict.gif | Bin 64 -> 164 bytes
org.spearce.egit.ui/icons/ovr/pending_add.gif | Bin 64 -> 0 bytes
org.spearce.egit.ui/icons/ovr/pending_remove.gif | Bin 111 -> 0 bytes
org.spearce.egit.ui/icons/ovr/shared.gif | Bin 106 -> 0 bytes
org.spearce.egit.ui/icons/ovr/staged.gif | Bin 0 -> 114 bytes
org.spearce.egit.ui/icons/ovr/staged_added.gif | Bin 0 -> 114 bytes
org.spearce.egit.ui/icons/ovr/staged_removed.gif | Bin 0 -> 114 bytes
org.spearce.egit.ui/icons/ovr/untracked.gif | Bin 0 -> 79 bytes
org.spearce.egit.ui/plugin.properties | 1 +
org.spearce.egit.ui/plugin.xml | 12 +-
.../src/org/spearce/egit/ui/Activator.java | 70 ++-
.../egit/ui/PluginPreferenceInitializer.java | 13 +
.../src/org/spearce/egit/ui/UIIcons.java | 19 +-
.../src/org/spearce/egit/ui/UIPreferences.java | 19 +
.../src/org/spearce/egit/ui/UIText.java | 87 ++-
.../src/org/spearce/egit/ui/internal/SWTUtils.java | 595 +++++++++++
.../egit/ui/internal/actions/BranchAction.java | 4 +-
.../egit/ui/internal/actions/Disconnect.java | 4 +-
.../egit/ui/internal/actions/ResetAction.java | 4 +-
.../decorators/GitLightweightDecorator.java | 1062 ++++++++++++++++++++
.../internal/decorators/GitResourceDecorator.java | 454 ---------
.../internal/decorators/IDecoratableResource.java | 93 ++
.../preferences/GitDecoratorPreferencePage.java | 911 +++++++++++++++++
.../src/org/spearce/egit/ui/uitext.properties | 35 +-
30 files changed, 3230 insertions(+), 495 deletions(-)
create mode 100644 org.spearce.egit.core/src/org/spearce/egit/core/GitException.java
create mode 100644 org.spearce.egit.core/src/org/spearce/egit/core/internal/util/ExceptionCollector.java
delete mode 100644 org.spearce.egit.ui/icons/ovr/assumevalid.gif
delete mode 100644 org.spearce.egit.ui/icons/ovr/pending_add.gif
delete mode 100644 org.spearce.egit.ui/icons/ovr/pending_remove.gif
delete mode 100644 org.spearce.egit.ui/icons/ovr/shared.gif
create mode 100644 org.spearce.egit.ui/icons/ovr/staged.gif
create mode 100644 org.spearce.egit.ui/icons/ovr/staged_added.gif
create mode 100644 org.spearce.egit.ui/icons/ovr/staged_removed.gif
create mode 100644 org.spearce.egit.ui/icons/ovr/untracked.gif
create mode 100644 org.spearce.egit.ui/src/org/spearce/egit/ui/internal/SWTUtils.java
create mode 100644 org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitLightweightDecorator.java
delete mode 100644 org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/GitResourceDecorator.java
create mode 100644 org.spearce.egit.ui/src/org/spearce/egit/ui/internal/decorators/IDecoratableResource.java
create mode 100644 org.spearce.egit.ui/src/org/spearce/egit/ui/internal/preferences/GitDecoratorPreferencePage.java
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
