YELLOW

refs 862

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/extension/base/ModelElementHandlerBase.java

@@ -36,12 +36,11 @@ import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 15034C4A5AB0D468364D08BDF136C88A
+ * @ConQAT.Rating YELLOW Hash: 11BDB7C11A598F86971B53E8D2970C51
  */
 public abstract class ModelElementHandlerBase<T extends EObject> implements IModelElementHandler<T> {
 
-	// TODO Dan: I don't really understand 'singleton' here
-	/** Stores the icon image. Use singleton to save the limited image buffers. */
+	/** Stores the icon image. */
 	private Image iconImage;
 
 	/** {@inheritDoc} */
@@ -101,7 +100,7 @@ public abstract class ModelElementHandlerBase<T extends EObject> implements IMod
 	/**
 	 * {@inheritDoc}
 	 * <P>
-	 * The default returns zero.
+	 * The default returns 1000000.
 	 */
 	@Override
 	public int getNavigatorViewWeight() {

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/LibraryView.java

@@ -20,9 +20,10 @@ package org.fortiss.tooling.kernel.ui.internal.views;
 import java.util.List;
 import java.util.Set;
 
+import org.conqat.ide.commons.ui.jface.TreeContentProviderBase;
+import org.conqat.ide.commons.ui.ui.EmptyPartListener;
 import org.conqat.lib.commons.collections.IdentityHashSet;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -32,7 +33,6 @@ import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IPartListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.dialogs.FilteredTree;
 import org.eclipse.ui.dialogs.PatternFilter;
@@ -53,7 +53,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
  * @author eder
  * @author $Author: hoelzl $
  * @version $Rev: 18709 $
- * @ConQAT.Rating YELLOW Hash: BE72B6F02711E4A856A619AA591E79A3
+ * @ConQAT.Rating YELLOW Hash: DF589FA4F689980A8844F3A6F0EFCA94
  */
 public class LibraryView extends ViewPart {
 
@@ -193,10 +193,7 @@ public class LibraryView extends ViewPart {
 	}
 
 	/** The content provider used in the library view. */
-	// TODO use org.conqat.ide.commons.ui.jface.TreeContentProviderBase -- it already provides
-	// useful implementation
-	private class LibraryTreeContentProvider implements ITreeContentProvider {
-
+	private class LibraryTreeContentProvider extends TreeContentProviderBase {
 		/** {@inheritDoc} */
 		@SuppressWarnings("rawtypes")
 		@Override
@@ -210,18 +207,6 @@ public class LibraryView extends ViewPart {
 			return new Object[0];
 		}
 
-		/** {@inheritDoc} */
-		@Override
-		public void dispose() {
-			// ignore
-		}
-
-		/** {@inheritDoc} */
-		@Override
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			// ignore
-		}
-
 		/** {@inheritDoc} */
 		@Override
 		public Object[] getChildren(Object parentElement) {
@@ -230,18 +215,6 @@ public class LibraryView extends ViewPart {
 			}
 			return new Object[0];
 		}
-
-		/** {@inheritDoc} */
-		@Override
-		public Object getParent(Object element) {
-			return null;
-		}
-
-		/** {@inheritDoc} */
-		@Override
-		public boolean hasChildren(Object element) {
-			return element instanceof ProtoypeCategory;
-		}
 	}
 
 	/** The filter used in the library view. */
@@ -268,12 +241,9 @@ public class LibraryView extends ViewPart {
 	}
 
 	/** If an editor in a different Project is opened the Model is reinitialized */
-	// TODO Dan: use org.conqat.ide.commons.ui.ui.EmptyPartListener
-	private class EditorActivationListener implements IPartListener {
+	private class EditorActivationListener extends EmptyPartListener {
 
-		/**
-		 * Change the tree viewer content whenever workbench part changes.
-		 */
+		/** Change the tree viewer content whenever workbench part changes. */
 		@Override
 		public void partActivated(IWorkbenchPart workbenchPart) {
 			if(!(workbenchPart instanceof IEditorPart)) {
@@ -283,29 +253,5 @@ public class LibraryView extends ViewPart {
 			IEditorPart part = (IEditorPart)workbenchPart;
 			switchWorkbenchEditor(part);
 		}
-
-		/** {@inheritDoc} */
-		@Override
-		public void partBroughtToTop(IWorkbenchPart part) {
-			// to react on activated is enough
-		}
-
-		/** {@inheritDoc} */
-		@Override
-		public void partClosed(IWorkbenchPart part) {
-			// nothing to do
-		}
-
-		/** {@inheritDoc} */
-		@Override
-		public void partDeactivated(IWorkbenchPart part) {
-			// nothing to do
-		}
-
-		/** {@inheritDoc} */
-		@Override
-		public void partOpened(IWorkbenchPart part) {
-			// nothing to do
-		}
 	}
 }

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorTreeContentProvider.java

@@ -21,9 +21,8 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.conqat.ide.commons.ui.jface.TreeContentProviderBase;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
 import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
 import org.fortiss.tooling.kernel.service.IPersistencyService;
 import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
@@ -35,10 +34,9 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
  * @author hoelzlf
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 35FE8AC061E04CB831EA242B15B8E408
+ * @ConQAT.Rating YELLOW Hash: E29E501A024D6EE428F3E4B50E6D4C06
  */
-// TODO extend org.conqat.ide.commons.ui.jface.TreeContentProviderBase
-public class NavigatorTreeContentProvider implements ITreeContentProvider {
+public class NavigatorTreeContentProvider extends TreeContentProviderBase {
 
 	/** Stores whether the expert view is active. **/
 	private boolean expertViewActive = false;
@@ -102,25 +100,6 @@ public class NavigatorTreeContentProvider implements ITreeContentProvider {
 		return null;
 	}
 
-	/** {@inheritDoc} */
-	@Override
-	public boolean hasChildren(Object element) {
-		return getChildren(element).length > 0;
-	}
-
-	/** {@inheritDoc} */
-	@Override
-	public void dispose() {
-		// nothing to do
-	}
-
-	/** {@inheritDoc} */
-	@Override
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		// the input of this viewer is the persistency service singleton and
-		// therefore never changes.
-	}
-
 	/**
 	 * Toggle the expert view. When expert view is active then more objects are
 	 * displayed in the tree.

org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/NavigatorViewPart.java

@@ -25,6 +25,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -68,7 +69,7 @@ import org.fortiss.tooling.kernel.ui.util.PropertiesConstantUtils;
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 707EE54612611744AD0229603E9533F2
+ * @ConQAT.Rating YELLOW Hash: D771755A46FD3B8CD9289DE2224A7C54
  */
 public final class NavigatorViewPart extends ViewPart implements ISelectionListener,
 		ISelectionChangedListener, ITabbedPropertySheetPageContributor, ContextMenuContextProvider,
@@ -148,11 +149,8 @@ public final class NavigatorViewPart extends ViewPart implements ISelectionListe
 	private void createLinkWithEditorAction() {
 		partListener = new LinkWithEditorPartListener();
 
-		// TODO refactor "ToolingKernelUIActivator.getDefault().getDialogSettings()" in a local
-		// variable - it comes too many times and makes the code more dirty
-		isLinkedWithEditor =
-				ToolingKernelUIActivator.getDefault().getDialogSettings()
-						.getBoolean(LINK_WITH_EDITOR_FLAG);
+		final IDialogSettings settings = ToolingKernelUIActivator.getDefault().getDialogSettings();
+		isLinkedWithEditor = settings.getBoolean(LINK_WITH_EDITOR_FLAG);
 		if(isLinkedWithEditor) {
 			getSite().getPage().addPartListener(partListener);
 		}
@@ -174,17 +172,14 @@ public final class NavigatorViewPart extends ViewPart implements ISelectionListe
 								.getModelElement());
 					}
 				}
-
-				ToolingKernelUIActivator.getDefault().getDialogSettings()
-						.put(LINK_WITH_EDITOR_FLAG, this.isChecked());
+				settings.put(LINK_WITH_EDITOR_FLAG, this.isChecked());
 			}
 		};
 
 		linkWithEditorAction.setImageDescriptor(ToolingKernelUIActivator
 				.getImageDescriptor("icons/link_with_editor.gif"));
 		linkWithEditorAction.setToolTipText("Link with editor");
-		linkWithEditorAction.setChecked(ToolingKernelUIActivator.getDefault().getDialogSettings()
-				.getBoolean(LINK_WITH_EDITOR_FLAG));
+		linkWithEditorAction.setChecked(settings.getBoolean(LINK_WITH_EDITOR_FLAG));
 
 		toggleExpertViewAction = new Action("Toggle expert view", SWT.TOGGLE) {