Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-12-01 16:09:20 -0500
committerAndre Weinand2004-12-01 16:09:20 -0500
commit9b32f815ee080095bb7ea4a68d4c70973ce6bfee (patch)
tree79bf013828780e99c95bd10d3366590581629e34 /bundles/org.eclipse.compare/compare
parentb41e1f626eed6a232855c1717d5beed9bbaf2c66 (diff)
downloadeclipse.platform.team-9b32f815ee080095bb7ea4a68d4c70973ce6bfee.tar.gz
eclipse.platform.team-9b32f815ee080095bb7ea4a68d4c70973ce6bfee.tar.xz
eclipse.platform.team-9b32f815ee080095bb7ea4a68d4c70973ce6bfee.zip
some cosmetics
Diffstat (limited to 'bundles/org.eclipse.compare/compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java48
1 files changed, 23 insertions, 25 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index 9e00db439..d90b72759 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -219,6 +219,28 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
ComparePreferencePage.initDefaults(getPreferenceStore());
}
+ public void stop(BundleContext context) throws Exception {
+
+ IPreferenceStore ps= getPreferenceStore();
+ rememberAliases(ps);
+ if (fPropertyChangeListener != null) {
+ ps.removePropertyChangeListener(fPropertyChangeListener);
+ fPropertyChangeListener= null;
+ }
+
+ super.stop(context);
+
+ if (fgDisposeOnShutdownImages != null) {
+ Iterator i= fgDisposeOnShutdownImages.iterator();
+ while (i.hasNext()) {
+ Image img= (Image) i.next();
+ if (!img.isDisposed())
+ img.dispose();
+ }
+ fgImages= null;
+ }
+ }
+
/**
* Returns the singleton instance of this plug-in runtime class.
*
@@ -396,28 +418,6 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
fgDisposeOnShutdownImages.add(image);
}
- public void stop(BundleContext context) throws Exception {
-
- IPreferenceStore ps= getPreferenceStore();
- rememberAliases(ps);
- if (fPropertyChangeListener != null) {
- ps.removePropertyChangeListener(fPropertyChangeListener);
- fPropertyChangeListener= null;
- }
-
- super.stop(context);
-
- if (fgDisposeOnShutdownImages != null) {
- Iterator i= fgDisposeOnShutdownImages.iterator();
- while (i.hasNext()) {
- Image img= (Image) i.next();
- if (!img.isDisposed())
- img.dispose();
- }
- fgImages= null;
- }
- }
-
/**
* Performs the comparison described by the given input and opens a
* compare editor on the result.
@@ -522,10 +522,8 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
public static ImageDescriptor getImageDescriptor(String relativePath) {
URL installURL= null;
- if (fgComparePlugin != null) {
- //installURL= fgComparePlugin.getDescriptor().getInstallURL();
+ if (fgComparePlugin != null)
installURL= fgComparePlugin.getBundle().getEntry("/"); //$NON-NLS-1$
- }
if (installURL != null) {
try {

Back to the top