Refactoring of name editor.

[taxeditor.git] / taxeditor-editor / src / main / java / eu / etaxonomy / taxeditor / editor / name / container / NameViewer.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameViewer.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/NameViewer.java
similarity index 97%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameViewer.java
rename to taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/NameViewer.java
index ad3a5a6dc5215213121890cb138cfba834a1eeb2..aa08018871e25a4951d1aff1094c1d99dbf08154 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/NameViewer.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/NameViewer.java
@@ -7,11 +7,10 @@
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
 
-package eu.etaxonomy.taxeditor.editor.name;
+package eu.etaxonomy.taxeditor.editor.name.container;
 
 import java.util.Iterator;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.text.Document;
@@ -61,8 +60,6 @@ import eu.etaxonomy.taxeditor.preference.Resources;
  * @version 1.0
  */
 public class NameViewer extends SourceViewer {
-       private static final Logger logger = Logger
-                       .getLogger(NameViewer.class);
                
        /** Constant <code>RULER_WIDTH=16</code> */
        public static final int RULER_WIDTH = 16;
@@ -157,7 +154,7 @@ public class NameViewer extends SourceViewer {
                if (ruler instanceof RulerWithIcon) {
                        ((RulerWithIcon) ruler).setIcon(icon);
                } else {
-                       logger.warn("Viewer's IVerticalRuler is not an instance of RulerWithIcon.");
+                       throw new IllegalStateException("Viewer's IVerticalRuler is not an instance of RulerWithIcon.");
                }
        }
        
@@ -315,7 +312,6 @@ public class NameViewer extends SourceViewer {
                        Assert.isNotNull(this.getTextWidget());
                        this.getTextWidget().setText(text);
                } catch (RuntimeException e) {
-                       logger.error("Could not set the text for a name viewer");
                        throw e;
                }
        }