From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 26 Sep 2016 04:32:13 +0000 (+0200)
Subject: Trim code
X-Git-Tag: 4.4.0^2~124
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/9c1235e74725c3db3cf497eb4d44fb1519f73ec3?hp=2753ac0796b32574a4de1bfd959404a4f67c4d77

Trim code
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
index da2a35523..71e33bed7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
@@ -1,114 +1,106 @@
-// $Id$
-/**
- * Copyright (C) 2009 EDIT
- * European Distributed Institute of Taxonomy
- * http://www.e-taxonomy.eu
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1
- * See LICENSE.TXT at the top of this package for the full license terms.
- */
-package eu.etaxonomy.taxeditor.editor.definedterm;
-
-import java.util.ArrayList;
-
-import org.apache.commons.lang.StringUtils;
-import org.eclipse.jface.viewers.StyledCellLabelProvider;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.StyledString.Styler;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.TextStyle;
-import org.eclipse.swt.widgets.Display;
-
-import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.cdm.model.common.Representation;
-import eu.etaxonomy.cdm.model.common.TermBase;
-import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-
-/**
- * @author l.morris
- * @date 9 Dec 2011
- *
- */
-public class TermLabelProvider extends StyledCellLabelProvider {
-
-    private static Color vocColor = Display.getCurrent().getSystemColor(SWT.COLOR_BLUE);
-    private Styler vocStyler;
-
-    public TermLabelProvider() {
-    }
-
-    public TermLabelProvider(Styler vocStyler){
-        this.vocStyler = vocStyler;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.jface.viewers.StyledCellLabelProvider#update(org.eclipse.
-     * jface.viewers.ViewerCell)
-     */
-    @Override
-    public void update(ViewerCell cell) {
-        Object element = cell.getElement();
-        int columnIndex = cell.getColumnIndex();
-
-        String text = getText(element);
-        cell.setText(text);
-
-        if (element instanceof TermVocabulary) {
-            StyledString styledString = new StyledString(text, getVocabularyStyler());
-            StyleRange[] styleRanges;
-            styleRanges = styledString.getStyleRanges();
-            cell.setStyleRanges(styleRanges);
-        }
-        super.update(cell);
-    }
-
-    public StyledString getStyledText(Object element) {
-
-        if (element instanceof TermVocabulary) {
-            new StyledString(getText(element), getVocabularyStyler());
-        }
-        return new StyledString(getText(element), StyledString.QUALIFIER_STYLER);
-    }
-
-    public String getText(Object element) {
-
-        if (element instanceof DefinedTermBase) {
-            DefinedTermBase<?> dtb = (DefinedTermBase<?>) element;
-
-            Representation rep = dtb.getRepresentation(PreferencesUtil.getGlobalLanguage());
-            if ( rep == null){
-                rep = dtb.getPreferredRepresentation(new ArrayList<Language>());
-            }
-            String label = rep != null? rep.getLabel() : dtb.getTitleCache();
-            return CdmUtils.concat(" : ", dtb.getIdInVocabulary(), label);
-
-        } else if (element instanceof TermBase) {
-            return ((TermBase) element).getTitleCache();
-        }
-
-        // FIXME : must throw an exception here
-        return element.toString();
-    }
-
-    private Styler getVocabularyStyler() {
-        if (vocStyler == null) {
-            vocStyler = new Styler() {
-                @Override
-                public void applyStyles(TextStyle textStyle) {
-                    textStyle.foreground = vocColor;
-                }
-            };
-        }
-        return vocStyler;
-    }
-
-}
+// $Id$
+/**
+ * Copyright (C) 2009 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
+package eu.etaxonomy.taxeditor.editor.definedterm;
+
+import java.util.ArrayList;
+
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.StyledString.Styler;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.TextStyle;
+import org.eclipse.swt.widgets.Display;
+
+import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.Representation;
+import eu.etaxonomy.cdm.model.common.TermBase;
+import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+
+/**
+ * @author l.morris
+ * @date 9 Dec 2011
+ *
+ */
+public class TermLabelProvider extends StyledCellLabelProvider {
+
+    private static Color vocColor = Display.getCurrent().getSystemColor(SWT.COLOR_BLUE);
+    private Styler vocStyler;
+
+    public TermLabelProvider() {
+    }
+
+    public TermLabelProvider(Styler vocStyler){
+        this.vocStyler = vocStyler;
+    }
+
+    @Override
+    public void update(ViewerCell cell) {
+        Object element = cell.getElement();
+        int columnIndex = cell.getColumnIndex();
+
+        String text = getText(element);
+        cell.setText(text);
+
+        if (element instanceof TermVocabulary) {
+            StyledString styledString = new StyledString(text, getVocabularyStyler());
+            StyleRange[] styleRanges;
+            styleRanges = styledString.getStyleRanges();
+            cell.setStyleRanges(styleRanges);
+        }
+        super.update(cell);
+    }
+
+    public StyledString getStyledText(Object element) {
+
+        if (element instanceof TermVocabulary) {
+            new StyledString(getText(element), getVocabularyStyler());
+        }
+        return new StyledString(getText(element), StyledString.QUALIFIER_STYLER);
+    }
+
+    public String getText(Object element) {
+
+        if (element instanceof DefinedTermBase) {
+            DefinedTermBase<?> dtb = (DefinedTermBase<?>) element;
+
+            Representation rep = dtb.getRepresentation(PreferencesUtil.getGlobalLanguage());
+            if ( rep == null){
+                rep = dtb.getPreferredRepresentation(new ArrayList<Language>());
+            }
+            String label = rep != null? rep.getLabel() : dtb.getTitleCache();
+            return CdmUtils.concat(" : ", dtb.getIdInVocabulary(), label);
+
+        } else if (element instanceof TermBase) {
+            return ((TermBase) element).getTitleCache();
+        }
+
+        // FIXME : must throw an exception here
+        return element.toString();
+    }
+
+    private Styler getVocabularyStyler() {
+        if (vocStyler == null) {
+            vocStyler = new Styler() {
+                @Override
+                public void applyStyles(TextStyle textStyle) {
+                    textStyle.foreground = vocColor;
+                }
+            };
+        }
+        return vocStyler;
+    }
+
+}