move the updating logic up.

2 files changed, 37 insertions, 56 deletions

diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
index a08c1a45..a2c031e9 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditorPage.java
@@ -110,7 +110,7 @@ public abstract class MavenPomEditorPage extends FormPage implements Adapter {
   // are we already updating model
   protected boolean updatingModel;
   
-  protected boolean updatingModel2 = false;
+  private boolean updatingModel2 = false;
 
   // have we loaded data?
   private boolean dataLoaded;
@@ -120,11 +120,36 @@ public abstract class MavenPomEditorPage extends FormPage implements Adapter {
   protected static PomPackage POM_PACKAGE = PomPackage.eINSTANCE;
 
   private Action selectParentAction;
+
+  private IModelStateListener listener;
+  
+  private boolean alreadyShown = false;
+
+  
   
   public MavenPomEditorPage(MavenPomEditor pomEditor, String id, String title) {
     super(pomEditor, id, title);
     this.pomEditor = pomEditor;
     this.inputHistory = new InputHistory(id);
+    listener = new IModelStateListener() {
+      public void modelResourceMoved(IStructuredModel oldModel, IStructuredModel newModel) {
+      }
+      public void modelResourceDeleted(IStructuredModel model) {
+      }
+      public void modelReinitialized(IStructuredModel structuredModel) {
+      }
+      public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty) {
+      }
+      public void modelChanged(IStructuredModel model) {
+        if (!updatingModel2) {
+          loadData();
+        }
+      }
+      public void modelAboutToBeReinitialized(IStructuredModel structuredModel) {
+      }
+      public void modelAboutToBeChanged(IStructuredModel model) {
+      }
+    };
     
   }
   
@@ -184,7 +209,17 @@ public abstract class MavenPomEditorPage extends FormPage implements Adapter {
   
   public void setActive(boolean active) {
     super.setActive(active);
+    
     doLoadData(active);
+    if (active) {
+      getPomEditor().getModel().addModelStateListener(listener);      
+    } else {
+      getPomEditor().getModel().removeModelStateListener(listener);      
+    }
+    if (active && alreadyShown) {
+      loadData();
+    } 
+    alreadyShown  = true;
     
     //MNGECLIPSE-2674 checkreadonly is only calculated once, no need
     // to update everytime this page gets active
@@ -481,6 +516,7 @@ public abstract class MavenPomEditorPage extends FormPage implements Adapter {
 
   public void dispose() {
     inputHistory.save();
+    getPomEditor().getModel().removeModelStateListener(listener);      
     
     deRegisterListeners();
     
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
index 01ba4e55..c5b51bc0 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/OverviewPage.java
@@ -198,33 +198,8 @@ public class OverviewPage extends MavenPomEditorPage {
 
   protected GridData projectSectionData;
 
-  private boolean alreadyShown = false;
-
-  private IModelStateListener listener;
-
   public OverviewPage(MavenPomEditor pomEditor) {
     super(pomEditor, IMavenConstants.PLUGIN_ID + ".pom.overview", Messages.OverviewPage_title); //$NON-NLS-1$
-    //TODO move up to parent..
-    listener = new IModelStateListener() {
-      public void modelResourceMoved(IStructuredModel oldModel, IStructuredModel newModel) {
-      }
-      public void modelResourceDeleted(IStructuredModel model) {
-      }
-      public void modelReinitialized(IStructuredModel structuredModel) {
-      }
-      public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty) {
-      }
-      public void modelChanged(IStructuredModel model) {
-        if (!updatingModel2) {
-          loadData();
-        }
-      }
-      public void modelAboutToBeReinitialized(IStructuredModel structuredModel) {
-      }
-      public void modelAboutToBeChanged(IStructuredModel model) {
-      }
-    };
-    
   }
 
   protected void createFormContent(IManagedForm managedForm) {
@@ -1354,36 +1329,6 @@ public class OverviewPage extends MavenPomEditorPage {
     return true;
   }
   
-  /* (non-Javadoc)
-   * @see org.eclipse.m2e.editor.pom.MavenPomEditorPage#setActive(boolean)
-   */
-  @Override
-  public void setActive(boolean active) {
-    super.setActive(active);
-    //TODO eventually do the logic in the parent codebase
-    if (active && alreadyShown) {
-      loadThis(RELOAD_ALL);
-    } 
-    //TODO move up to parent class eventually
-    if (active) {
-      getPomEditor().getModel().addModelStateListener(listener);      
-    } else {
-      getPomEditor().getModel().removeModelStateListener(listener);      
-    }
-    alreadyShown  = true;
-  }
-  
-
-  /* (non-Javadoc)
-   * @see org.eclipse.m2e.editor.pom.MavenPomEditorPage#dispose()
-   */
-  @Override
-  public void dispose() {
-    getPomEditor().getModel().removeModelStateListener(listener);      
-    super.dispose();
-  }
-
-
   public class ModulesLabelProvider extends StringLabelProvider {
     
     private final MavenPomEditorPage editorPage;