kadosu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 100
committer: Martin Schaaf <mascha@xxxxxxxxxx>
branch nick: kadosu
timestamp: Mon 2009-04-20 20:42:18 +0200
message:
  o add option to overwrite exsiting index otherwise update
  o make option persistent
  o remove dialog that asked for user input previously
modified:
  org.kadosu/src/main/java/org/kadosu/ui/views/IndexButtonMouseListener.java
  org.kadosu/src/main/java/org/kadosu/ui/views/IndexerView.java

=== modified file 'org.kadosu/src/main/java/org/kadosu/ui/views/IndexButtonMouseListener.java'
--- org.kadosu/src/main/java/org/kadosu/ui/views/IndexButtonMouseListener.java	2009-04-12 19:56:48 +0000
+++ org.kadosu/src/main/java/org/kadosu/ui/views/IndexButtonMouseListener.java	2009-04-20 18:42:18 +0000
@@ -11,10 +11,8 @@
 import java.util.Collection;
 
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
-import org.kadosu.exception.KDSCancelException;
 import org.kadosu.indexer.KadosuIndexer;
 import org.kadosu.misc.Utils;
 import org.kadosu.ui.plugin.KadosuPlugin;
@@ -47,18 +45,10 @@
     try {
       final Collection<String> indexDirC = Utils.getLuceneIndexes( indexDir);
       if (indexDirC.contains( indexName)) {
-        final int buttonPressed = fIndexerView.openDecisionMsgBox( "Index allready exists",
-            "The index you want to create allready exists.\nOverwrite it?");
-
-        switch (buttonPressed) {
-          case SWT.YES:
-            overwrite = true;
-            break;
-          case SWT.NO:
-            overwrite = false;
-            break;
-          default:
-            throw new KDSCancelException( "Indexing cancelled");
+        if (fIndexerView.overwrite()) {
+          overwrite = true;
+        } else {
+          overwrite = false;
         }
       }
 
@@ -73,8 +63,6 @@
     } catch (final IOException e) {
       fIndexerView.openErrorMsgBox( "IOException", "Possibly can't create index '" + indexName + "' in '" + indexDir.getAbsolutePath()
           + "'.\n" + e.getLocalizedMessage());
-    } catch (final KDSCancelException e) {
-      // cancelled
     }
   }
 }

=== modified file 'org.kadosu/src/main/java/org/kadosu/ui/views/IndexerView.java'
--- org.kadosu/src/main/java/org/kadosu/ui/views/IndexerView.java	2009-04-12 19:56:48 +0000
+++ org.kadosu/src/main/java/org/kadosu/ui/views/IndexerView.java	2009-04-20 18:42:18 +0000
@@ -18,6 +18,9 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IViewSite;
+import org.eclipse.ui.PartInitException;
 
 public class IndexerView extends AbstractKadosuView {
 
@@ -38,6 +41,10 @@
 
   private Label fIndexNameLabel;
 
+  private Button fCheckbox;
+
+  private boolean fOverwrite;
+
   /**
    *  
    */
@@ -98,6 +105,12 @@
 
     initIndexNameCombo();
 
+    fCheckbox = new Button( composite, SWT.LEFT | SWT.CHECK);
+    fCheckbox.setLayoutData( AbstractKadosuView.createGridData( GridData.FILL_BOTH, 1, 3, false, false));
+    fCheckbox.setText( "Overwrite existing index");
+    fCheckbox.setToolTipText( "Overwrite index if it already exist, otherwise update.");
+    fCheckbox.setSelection( fOverwrite);
+
     ExpandItem item0 = new ExpandItem( bar, SWT.NONE, 0);
     item0.setHeight( composite.computeSize( SWT.DEFAULT, SWT.DEFAULT).y);
     item0.setControl( composite);
@@ -121,4 +134,25 @@
   public Button getIndexButton() {
     return fIndexButton;
   }
+
+  public boolean overwrite() {
+    return fCheckbox.getSelection();
+  }
+
+  @Override
+  public void saveState( final IMemento memento) {
+    memento.putBoolean( IndexerView.ID_VIEW + ".overwrite", overwrite());
+    super.saveState( memento);
+  }
+
+  @Override
+  public void init( final IViewSite site, final IMemento memento) throws PartInitException {
+    super.init( site, memento);
+    final Boolean overwrite = memento.getBoolean( IndexerView.ID_VIEW + ".overwrite");
+    if (null != overwrite) {
+      fOverwrite = overwrite.booleanValue();
+    } else {
+      fOverwrite = false;
+    }
+  }
 }



--

https://code.launchpad.net/~kadosu-dev/kadosu/main

Your team Kadosu Developer is subscribed to branch lp:kadosu.
To unsubscribe from this branch go to https://code.launchpad.net/~kadosu-dev/kadosu/main/+edit-subscription.