From c039c4f6a4932557d0b43737968c79707e512396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20D=C3=B6bber?= <doebber@in.tum.de> Date: Tue, 24 Jan 2012 12:40:49 +0000 Subject: [PATCH] reviewed tooling.base.ui refs 311 --- .../ui/contentprovider/TableContentProviderBase.java | 2 +- ...stractDecoratedTextCellDatabindingEditingSupport.java | 2 +- .../AbstractTextCellDatabindingEditingSupport.java | 2 +- .../tooling/base/ui/editor/DiagramEditorBase.java | 2 +- .../base/ui/editpart/command/ReconnectCommand.java | 2 +- .../base/ui/editpart/figure/PrettyInsetEllipse.java | 5 ++++- .../base/ui/editpart/figure/PrettyRoundedRectangle.java | 5 ++++- .../base/ui/editpart/policy/DiagramLayoutEditPolicy.java | 2 +- .../base/ui/editpart/policy/ElementLayoutEditPolicy.java | 2 +- .../policy/RelayCreateCommandEditPolicyBase.java | 2 +- .../view/PropertySectionWithCopyPasteBase.java | 2 +- .../tooling/base/ui/tablecell/CheckBoxLabelProvider.java | 2 +- .../tooling/base/ui/tablecell/IconNameLabelProvider.java | 2 +- .../org/fortiss/tooling/base/ui/utils/ActionUtils.java | 9 +++++---- 14 files changed, 24 insertions(+), 17 deletions(-) diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java index cec248f61..a8ae42b7c 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/contentprovider/TableContentProviderBase.java @@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Table; * @author ratiu * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating YELLOW Hash: A0EBE838F6C48C637BF66BDCC7BECCF6 + * @ConQAT.Rating GREEN Hash: 9BD7A35B68F2A0C579302785D426E260 */ public abstract class TableContentProviderBase implements IStructuredContentProvider { diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java index 86b433ece..a7a67746c 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellDatabindingEditingSupport.java @@ -40,7 +40,7 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: F74F00C2F5462687008A52D13BA242A6 + * @ConQAT.Rating GREEN Hash: 2C4AFF788977B23F89AC273AB9E26FFA */ public abstract class AbstractDecoratedTextCellDatabindingEditingSupport extends AbstractTextCellDatabindingEditingSupport { diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java index a22f9ad35..2b6c6c527 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellDatabindingEditingSupport.java @@ -38,7 +38,7 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: 97B2B23D7EF5DA85AEF4EF792A1C394D + * @ConQAT.Rating GREEN Hash: 111846AC9BFA6A0AFD10DED43942929C */ public abstract class AbstractTextCellDatabindingEditingSupport extends EditingSupport { diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java index 57668728f..b3ecac5b1 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/DiagramEditorBase.java @@ -102,7 +102,7 @@ import org.fortiss.tooling.kernel.ui.util.EObjectSelectionUtils; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: 29B690AA556FE2BDF57B347269A25E91 + * @ConQAT.Rating GREEN Hash: 2BE9DAC51D493CE6884BC5780CCBA3BD */ public class DiagramEditorBase<T extends EObject> extends GEFEditorBase<T> implements IPostSelectionProvider, ContextMenuContextProvider { diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ReconnectCommand.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ReconnectCommand.java index ceac76af5..0362b36d1 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ReconnectCommand.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/command/ReconnectCommand.java @@ -31,7 +31,7 @@ import org.fortiss.tooling.kernel.service.IConnectionCompositorService; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: 24421D2AC104331D9746EEAF90095300 + * @ConQAT.Rating GREEN Hash: B647C020917AB70601507C6FE044FB31 */ public class ReconnectCommand extends ConnectCommand { diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java index bfb328f70..9802a436c 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyInsetEllipse.java @@ -38,7 +38,7 @@ import org.eclipse.swt.graphics.Path; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: 7E86CA664B6B561EE22AEC45CC29C1E2 + * @ConQAT.Rating RED Hash: 84A2AF464E9E0229F704456147BCFAFD */ public class PrettyInsetEllipse extends Shape { @@ -89,6 +89,9 @@ public class PrettyInsetEllipse extends Shape { EVisualStyle style = EVisualStyle.get(); gfx.pushState(); gfx.setAntialias(SWT.ON); + // TODO @review CD: During last iteration most of the glossy look + // implementation disappeared. Yet this remained. As seen before the + // only effect are ugly borders. I suggest removal. if (style == EVisualStyle.Glossy) { // Glossy style. gfx.setLineCap(SWT.CAP_ROUND); diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java index f6c6a4b0b..d5b15913b 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/figure/PrettyRoundedRectangle.java @@ -36,7 +36,7 @@ import org.eclipse.swt.graphics.Color; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: 34D4F4B5FBB7A3565AE4065D4D7EFED2 + * @ConQAT.Rating RED Hash: 366867FD2CA94416DC46D9459E4F5F15 */ public class PrettyRoundedRectangle extends Shape { @@ -79,6 +79,9 @@ public class PrettyRoundedRectangle extends Shape { final EVisualStyle style = EVisualStyle.get(); gfx.pushState(); gfx.setAntialias(SWT.ON); + // TODO @review CD: During last iteration most of the glossy look + // implementation disappeared. Yet this remained. As seen before the + // only effect are ugly borders. I suggest removal. if (style == EVisualStyle.Glossy) { // Glossy style. gfx.setLineCap(SWT.CAP_ROUND); diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java index 8c2bda19f..94c216f8a 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/DiagramLayoutEditPolicy.java @@ -39,7 +39,7 @@ import org.fortiss.tooling.base.ui.editpart.command.MoveWithinDiagramCommand; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: DC3E049397CBC5F1BA2B9181C1B6C9B7 + * @ConQAT.Rating GREEN Hash: C38D33442463E6AF17EEE984600F870A */ public class DiagramLayoutEditPolicy extends RelayCreateCommandEditPolicyBase { diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java index 6904920a1..84f12d7c5 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/ElementLayoutEditPolicy.java @@ -39,7 +39,7 @@ import org.fortiss.tooling.kernel.model.INamedCommentedElement; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: F419FCA55F52F78F6EB0C7D80AF32627 + * @ConQAT.Rating GREEN Hash: 2002CCBC71CE58099D0C1BACCB5D4CE6 */ public class ElementLayoutEditPolicy<T extends ILayoutedModelElement & INamedCommentedElement> extends RelayCreateCommandEditPolicyBase { diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RelayCreateCommandEditPolicyBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RelayCreateCommandEditPolicyBase.java index 9fb6005f0..51ead6f2f 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RelayCreateCommandEditPolicyBase.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/RelayCreateCommandEditPolicyBase.java @@ -43,7 +43,7 @@ import org.fortiss.tooling.kernel.ui.dnd.ElementCompositionSource; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: 66E79A7E8FC55B782B9141E8473B8A7B + * @ConQAT.Rating GREEN Hash: C903DB73D3ADA8738234F94935C0CDDE */ public abstract class RelayCreateCommandEditPolicyBase extends LayoutEditPolicy { diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/properties/view/PropertySectionWithCopyPasteBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/properties/view/PropertySectionWithCopyPasteBase.java index a59d9b1ca..f7205c067 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/properties/view/PropertySectionWithCopyPasteBase.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/properties/view/PropertySectionWithCopyPasteBase.java @@ -32,7 +32,7 @@ import org.fortiss.tooling.kernel.ui.extension.base.PropertySectionBase; * @author ratiu * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating YELLOW Hash: 28164A1500812F5F071D29F4ECBD38B9 + * @ConQAT.Rating GREEN Hash: 6428F3826328029F86C7993F10E23746 */ public abstract class PropertySectionWithCopyPasteBase<T extends IModelElementSpecification> extends PropertySectionBase { diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxLabelProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxLabelProvider.java index 6657d3d78..e763bf2ed 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxLabelProvider.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/CheckBoxLabelProvider.java @@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.Shell; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: 1879A8B4DD69C9B0CA8F5E9C62920F71 + * @ConQAT.Rating GREEN Hash: C473EA62A46BAA323662C9046C2921B5 */ // Using drawn images may seem strange, but internet sources could not provide // any other solution to having checkbox in cell editors diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/IconNameLabelProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/IconNameLabelProvider.java index 45785f5c1..f633665cb 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/IconNameLabelProvider.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/tablecell/IconNameLabelProvider.java @@ -35,7 +35,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: CA5333015D50B981971B61CD6B9D5B89 + * @ConQAT.Rating GREEN Hash: C7F3355267F72F318C897785861BF6AB */ public class IconNameLabelProvider implements IStyledLabelProvider { /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ActionUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ActionUtils.java index 1ec2dd522..4cc2b6c53 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ActionUtils.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/ActionUtils.java @@ -17,9 +17,10 @@ $Id$ +--------------------------------------------------------------------------*/ package org.fortiss.tooling.base.ui.utils; +import static org.junit.Assert.assertNotNull; + import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; -import org.junit.Assert; /** * Utility methods for handling JFace {@link Action}s. @@ -27,7 +28,7 @@ import org.junit.Assert; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: C8DACEDA16494E5C0312EFC88604471D + * @ConQAT.Rating GREEN Hash: 17F433D987A785A1914ADD5B8B899795 */ public class ActionUtils { @@ -51,8 +52,8 @@ public class ActionUtils { action.setToolTipText(toolTip); action.setEnabled(true); - Assert.assertNotNull(icon); - Assert.assertNotNull(disabledIcon); + assertNotNull(icon); + assertNotNull(disabledIcon); action.setImageDescriptor(icon); action.setDisabledImageDescriptor(disabledIcon); -- GitLab