Skip to content
Snippets Groups Projects
Commit 233cd65a authored by Florian Hölzl's avatar Florian Hölzl
Browse files

GREEN

refs 2093
parent 4b65b54a
No related branches found
No related tags found
No related merge requests found
Showing with 21 additions and 23 deletions
......@@ -44,7 +44,7 @@ import org.osgi.framework.Bundle;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: B25B0479BD31F6D0845AB2D106EBF7AD
* @ConQAT.Rating GREEN Hash: C768848649422B67FE033EFFD57F7A04
*/
public class ContextMenuService implements IContextMenuService {
......
......@@ -59,7 +59,7 @@ import org.fortiss.tooling.kernel.utils.KernelModelElementUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 94163C77E97313EACB590ED3E9178BB3
* @ConQAT.Rating GREEN Hash: 8D45C2B6E2FC7158EF002A9ECE848DD2
*/
public class ModelEditorBindingService extends
EObjectAwareServiceBase<IModelEditorBinding<EObject>> implements
......@@ -85,7 +85,6 @@ public class ModelEditorBindingService extends
/** Constructor. */
public ModelEditorBindingService() {
super();
}
/** {@inheritDoc} */
......
......@@ -17,12 +17,13 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.kernel.ui.internal;
import static org.conqat.ide.commons.ui.logging.LoggingUtils.error;
import java.io.IOException;
import java.util.EventObject;
import java.util.HashMap;
import java.util.Map;
import org.conqat.ide.commons.ui.logging.LoggingUtils;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
......@@ -51,7 +52,7 @@ import org.fortiss.tooling.kernel.ui.service.INavigatorService;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: AC28DE318F6E378FA08D72E8C999E952
* @ConQAT.Rating GREEN Hash: 5CAFA7A9F863FE54AFDC572CDE0B8CD9
*/
public class NavigatorService implements INavigatorService, IPersistencyServiceListener,
CommandStackListener {
......@@ -221,8 +222,7 @@ public class NavigatorService implements INavigatorService, IPersistencyServiceL
try {
context.doSave(monitor);
} catch(IOException e) {
LoggingUtils.error(ToolingKernelActivator.getDefault(), "Error during save of " +
getName(), e);
error(ToolingKernelActivator.getDefault(), "Error during save of " + getName(), e);
}
}
......
......@@ -38,7 +38,7 @@ import org.fortiss.tooling.kernel.service.ICommandStackService;
* @author hummel
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: FC85FD96591F7D53E6527374078B090E
* @ConQAT.Rating GREEN Hash: 1521D09BB182513D539E2EAD7BD8E5EE
*/
public class EObjectObservableValue extends AbstractObservableValue {
......
......@@ -17,15 +17,14 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.kernel.ui.internal.editor;
import static java.util.Collections.sort;
import static org.conqat.ide.commons.ui.logging.LoggingUtils.error;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.EventObject;
import java.util.List;
import org.conqat.ide.commons.ui.logging.LoggingUtils;
import org.conqat.lib.commons.collections.IdentityHashSet;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.command.CommandStackListener;
......@@ -61,7 +60,7 @@ import org.fortiss.tooling.kernel.ui.util.PropertiesConstantUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 176BBDECF9C4F18CD99174AC12456E24
* @ConQAT.Rating GREEN Hash: 7DD7A2764069A68CAE77631A5398BF07
*/
@SuppressWarnings("rawtypes")
public class ExtendableMultiPageEditor extends MultiPageEditorPart implements
......@@ -180,7 +179,7 @@ public class ExtendableMultiPageEditor extends MultiPageEditorPart implements
int pageIndex = 0;
List<IModelEditorBinding<EObject>> bindings =
IModelEditorBindingService.INSTANCE.getBindings(editedObject);
Collections.sort(bindings, new Comparator<IModelEditorBinding<EObject>>() {
sort(bindings, new Comparator<IModelEditorBinding<EObject>>() {
@Override
public int compare(IModelEditorBinding<EObject> o1, IModelEditorBinding<EObject> o2) {
return o2.getPriority() - o1.getPriority();
......@@ -196,8 +195,7 @@ public class ExtendableMultiPageEditor extends MultiPageEditorPart implements
setPageText(pageIndex++, editorBinding.getLabel(editedObject));
}
} catch(Exception ex) {
LoggingUtils.error(ToolingKernelActivator.getDefault(),
"Editor instantiation failed.", ex);
error(ToolingKernelActivator.getDefault(), "Editor instantiation failed.", ex);
}
}
}
......
......@@ -37,7 +37,7 @@ import org.fortiss.tooling.kernel.ui.util.ObservableUtils;
* @author ratiu
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: 4E16EDE7958E8E5A1C74359119B5D152
* @ConQAT.Rating GREEN Hash: 536B0507037A83401119BD667E1B1164
*/
public class NamedCommentedPropertySection extends PropertySectionBase {
......
......@@ -17,6 +17,10 @@ $Id$
+--------------------------------------------------------------------------*/
package org.fortiss.tooling.kernel.ui.internal.views;
import static org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils.getEObjectElements;
import static org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils.getFirstElement;
import static org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils.getSelectionService;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
......@@ -62,7 +66,6 @@ import org.fortiss.tooling.kernel.ui.presentation.ModelElementLabelProvider;
import org.fortiss.tooling.kernel.ui.service.IActionService;
import org.fortiss.tooling.kernel.ui.service.IContextMenuService;
import org.fortiss.tooling.kernel.ui.service.INavigatorService;
import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils;
import org.fortiss.tooling.kernel.ui.util.PropertiesConstantUtils;
/**
......@@ -71,7 +74,7 @@ import org.fortiss.tooling.kernel.ui.util.PropertiesConstantUtils;
* @author hoelzl
* @author $Author$
* @version $Rev$
* @ConQAT.Rating YELLOW Hash: F53B372E267C0947E0F73072C0929B80
* @ConQAT.Rating GREEN Hash: ABB2056581F36E3AC0098B0B44CA8CE4
*/
public final class NavigatorViewPart extends ViewPart implements ISelectionListener,
ISelectionChangedListener, ITabbedPropertySheetPageContributor, ContextMenuContextProvider,
......@@ -145,7 +148,7 @@ public final class NavigatorViewPart extends ViewPart implements ISelectionListe
IActionService.INSTANCE.registerGlobalActions(getViewSite().getActionBars());
createLinkWithEditorAction();
EObjectSelectionUtils.getSelectionService().addSelectionListener(this);
getSelectionService().addSelectionListener(this);
getSite().getPage().addPartListener(partListener);
}
......@@ -270,7 +273,7 @@ public final class NavigatorViewPart extends ViewPart implements ISelectionListe
public void dispose() {
((NavigatorService)INavigatorService.INSTANCE).setNavigatorViewPart(null);
EObjectSelectionUtils.getSelectionService().removeSelectionListener(this);
getSelectionService().removeSelectionListener(this);
getSite().setSelectionProvider(null);
getSite().getPage().removePartListener(partListener);
......@@ -344,15 +347,13 @@ public final class NavigatorViewPart extends ViewPart implements ISelectionListe
/** {@inheritDoc} */
@Override
public EObject getSelectedModelElement() {
return EObjectSelectionUtils.getFirstElement(getSite().getSelectionProvider()
.getSelection());
return getFirstElement(getSite().getSelectionProvider().getSelection());
}
/** {@inheritDoc} */
@Override
public List<EObject> getSelectedModelElementList() {
return EObjectSelectionUtils.getEObjectElements(getSite().getSelectionProvider()
.getSelection());
return getEObjectElements(getSite().getSelectionProvider().getSelection());
}
/** Returns whether expert view is active. */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment