Diff enhancement clearcase_alpha_1
authormsandor@netbeans.org
Tue, 05 Feb 2008 11:00:09 +0100
changeset 10223d70884117e1d
parent 10222 b651de0a12c8
child 10224 89d7ef37bcd3
Diff enhancement
clearcase/src/org/netbeans/modules/clearcase/ui/checkin/CheckinAction.java
clearcase/src/org/netbeans/modules/clearcase/ui/diff/MultiDiffPanel.java
     1.1 --- a/clearcase/src/org/netbeans/modules/clearcase/ui/checkin/CheckinAction.java	Tue Feb 05 17:15:40 2008 +0800
     1.2 +++ b/clearcase/src/org/netbeans/modules/clearcase/ui/checkin/CheckinAction.java	Tue Feb 05 11:00:09 2008 +0100
     1.3 @@ -215,6 +215,15 @@
     1.4          }
     1.5          prepareTask.schedule(0);
     1.6      }
     1.7 +
     1.8 +    /**
     1.9 +     * Programmatically invoke the checkin action on some context.
    1.10 +     * 
    1.11 +     * @param context a context to check in
    1.12 +     */
    1.13 +    public static void checkin(VCSContext context) {
    1.14 +        new CheckinAction("", context).actionPerformed(null);        
    1.15 +    }
    1.16      
    1.17      public void commandStarted()        { /* boring */ }
    1.18      public void outputText(String line) { /* boring */ }
     2.1 --- a/clearcase/src/org/netbeans/modules/clearcase/ui/diff/MultiDiffPanel.java	Tue Feb 05 17:15:40 2008 +0800
     2.2 +++ b/clearcase/src/org/netbeans/modules/clearcase/ui/diff/MultiDiffPanel.java	Tue Feb 05 11:00:09 2008 +0100
     2.3 @@ -49,6 +49,7 @@
     2.4  import org.netbeans.modules.clearcase.FileInformation;
     2.5  import org.netbeans.modules.clearcase.Clearcase;
     2.6  import org.netbeans.modules.clearcase.FileStatusCache;
     2.7 +import org.netbeans.modules.clearcase.ui.checkin.CheckinAction;
     2.8  import org.netbeans.modules.clearcase.util.ClearcaseUtils;
     2.9  import org.netbeans.api.diff.DiffController;
    2.10  import org.netbeans.api.diff.StreamSource;
    2.11 @@ -251,7 +252,7 @@
    2.12      public void addNotify() {
    2.13          super.addNotify();
    2.14          if (refreshTask != null) {
    2.15 -//            Clearcase.getInstance().getFileStatusCache().addVersioningListener(this);
    2.16 +            Clearcase.getInstance().getFileStatusCache().addVersioningListener(this);
    2.17          }
    2.18          JComponent parent = (JComponent) getParent();
    2.19          parent.getActionMap().put("jumpNext", nextAction);  // NOI18N
    2.20 @@ -283,19 +284,17 @@
    2.21      }
    2.22      
    2.23      public void removeNotify() {
    2.24 -//        Clearcase.getInstance().getFileStatusCache().removeVersioningListener(this);
    2.25 +        Clearcase.getInstance().getFileStatusCache().removeVersioningListener(this);
    2.26          super.removeNotify();
    2.27      }
    2.28      
    2.29      public void versioningEvent(VersioningEvent event) {
    2.30 -/*
    2.31          if (event.getId() == FileStatusCache.EVENT_FILE_STATUS_CHANGED) {
    2.32              if (!affectsView(event)) {
    2.33                  return;
    2.34              }
    2.35              refreshTask.schedule(200);
    2.36          }
    2.37 -*/
    2.38      }
    2.39      
    2.40      private boolean affectsView(VersioningEvent event) {
    2.41 @@ -428,7 +427,7 @@
    2.42      
    2.43      private void onCommitButton() {
    2.44          LifecycleManager.getDefault().saveAll();
    2.45 -//        CommitAction.commit(contextName, context);
    2.46 +        CheckinAction.checkin(context);
    2.47      }
    2.48  
    2.49      /** Next that is driven by visibility. It continues to next not yet visible difference. */