diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/AnnotationEditingSupportBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/AnnotationEditingSupportBase.java index e77db54d743ada34f805d729493d7c88cd0cba80..3aad274038085b7c6e5928241699efc2a762c907 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/AnnotationEditingSupportBase.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/AnnotationEditingSupportBase.java @@ -118,7 +118,6 @@ public abstract class AnnotationEditingSupportBase extends EditingSupport { } }); this.getViewer().refresh(true); - } } } diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ComboBoxEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ComboBoxEditingSupport.java index 3625a4809fdc99291867440ad974eecd35c7cf72..4d2f503dc42340c861fed4a3e00c9e332e21d4a9 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ComboBoxEditingSupport.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/ComboBoxEditingSupport.java @@ -196,5 +196,4 @@ public class ComboBoxEditingSupport extends AnnotationEditingSupportBase { return null; } - } diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java index 24eead56983d5eff02fa0bea9251f32e03ef3c83..b21335eab225925157d13decc17e3ff7ac3213d2 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java @@ -162,7 +162,6 @@ public class EditingSupportFactory { throw new Exception( "For feature multiplicity > 1, EStructuralValueProvider has been implemented for EReferences and EEnumns, only ."); - } /** @@ -191,13 +190,11 @@ public class EditingSupportFactory { valueProvider.getCurrentInputChoiceMap(); if(fixedInputChoice == null || !fixedInputChoice.isEmpty()) { currentInputChoiceMap.put(instanceKey, fixedInputChoice); - } else { Object viewerInput = viewer.getInput(); if(!(viewerInput instanceof Set<?>) || ((Set<?>)viewerInput).isEmpty() || !(((Set<?>)viewerInput).iterator().next() instanceof AnnotationEntry)) { currentInputChoiceMap.put(instanceKey, null); - } else { AnnotationEntry annotationEntry = diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionCellEditor.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionCellEditor.java index 4ddba67a1571f128dbf453f48a8a9580486527f7..4160ebf15bd0cdfac6c0fa7457d01dcc7d774110 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionCellEditor.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionCellEditor.java @@ -255,7 +255,6 @@ public class MultiSelectionCellEditor extends DialogCellEditor { "Select " + lowerMultiplicityBound + " to " + upperMultiplicityBound + " " + titleElementStringHelper(upperMultiplicityBound); } - } newShell.setText(title); } diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionEditingSupport.java index 1e6ba71df2dc72b772fbd307235f3ca5818f6b88..5b2a753dcd5fb1ddfcacb770143d5a7a9fdcc9cd 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionEditingSupport.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/MultiSelectionEditingSupport.java @@ -125,11 +125,9 @@ public class MultiSelectionEditingSupport extends AnnotationEditingSupportBase { if(value instanceof Collection<?>) { return "[" + ((Collection<?>)value).size() + " selected]"; } - } return "[0 selected]"; - } /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/AnnotationLabelProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/AnnotationLabelProvider.java index 615e29ec5cb261f950eed405877d21b3d9ad7ef6..00cd6d01ffae37cc94e09c9f243b7af6bbbecaf6 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/AnnotationLabelProvider.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/AnnotationLabelProvider.java @@ -120,7 +120,6 @@ public class AnnotationLabelProvider extends LabelProviderBase { } return READ_ONLY_ANNOTATION_BACKGROUND_COLOR; } - } return super.getBackground(element); } diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/EmulatedNativeCheckBoxLabelProvider.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/EmulatedNativeCheckBoxLabelProvider.java index 995a0bc768d49f502f040d455cd14f939eb3b424..198cc03ab1fcb4fc8326eb42bbf5246511eee44d 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/EmulatedNativeCheckBoxLabelProvider.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/labelprovider/EmulatedNativeCheckBoxLabelProvider.java @@ -135,7 +135,6 @@ public class EmulatedNativeCheckBoxLabelProvider extends AnnotationLabelProvider } } } - } @Override diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/IAnnotationViewPart.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/IAnnotationViewPart.java index abfaf937f6796d812665408c0b96d206a46ae72d..373248fc0a4b7773c87d4ee66c2955034ebf2f5c 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/IAnnotationViewPart.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/IAnnotationViewPart.java @@ -36,5 +36,4 @@ public interface IAnnotationViewPart { /** Returns the currently selected object. */ public IModelElement getCurrentlySelectedObject(); - } diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/CreateAnnotationInstanceColumn.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/CreateAnnotationInstanceColumn.java index 91d33527d9ef394ea7f2defff532a2959a2f3a52..b9bb177b16f013a92f9f65a200bf6c0ef432ad80 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/CreateAnnotationInstanceColumn.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/CreateAnnotationInstanceColumn.java @@ -261,7 +261,6 @@ public class CreateAnnotationInstanceColumn extends ViewerColumn { value = "0"; } } - } AnnotationEntry entry = diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java index 9e96fbb11cf0b4d7c605c9c2bc4c86cf992f900b..4b9d40685269b07d122466e64d39ac50c7614d20 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/GenericAnnotationView.java @@ -237,7 +237,6 @@ public class GenericAnnotationView extends AnnotationViewPartBase { if(annotationFilter.passesColumnFilter(columnHandle)) { sortedColumnHandles.add(columnHandle); } - } } } @@ -468,7 +467,6 @@ public class GenericAnnotationView extends AnnotationViewPartBase { new CreateAnnotationInstanceColumn(tableViewer, SWT.NONE, columnHandle.getAnnotatedSpecification(), columnHandle.getEntry()); tableColumn = column.getColumn(); - } else { Class<? extends IAnnotatedSpecification> annotationClass = columnHandle.getAnnotatedSpecification().getClass(); @@ -486,7 +484,6 @@ public class GenericAnnotationView extends AnnotationViewPartBase { annotationClass.getCanonicalName() + ((e.getMessage() != null) ? ": " + e.getMessage() : ".")); } - } if(tableColumn != null) { @@ -517,7 +514,6 @@ public class GenericAnnotationView extends AnnotationViewPartBase { } } } - } /** diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilter.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilter.java index e9048b9ba608783b9c80257f02d335b5fc12e7ce..031012806c9f236ed634909415e7da22fad92f57 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilter.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilter.java @@ -162,7 +162,6 @@ public class AnnotationFilter extends ViewerFilter { if(currentlySelectedModelElement != modelElementAncestor) { return false; } - } Class<? extends IModelElement> modelElementClass = modelElement.getClass(); diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilterWidget.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilterWidget.java index ef0c2c625a78c1740556348e6df1fc93ba2f1761..0fcb03beb1d76b64d90d789f39a07bca6ef51eec 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilterWidget.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/view/generic/filter/AnnotationFilterWidget.java @@ -126,7 +126,6 @@ public class AnnotationFilterWidget extends Composite { Display display = Display.getCurrent(); if(filterPattern.equals(AnnotationFilter.FILTER_HINT_TEXT)) { nameFilterText.setForeground(display.getSystemColor(SWT.COLOR_DARK_GRAY)); - } else { nameFilterText.setForeground(display .getSystemColor(SWT.COLOR_WIDGET_FOREGROUND)); @@ -151,7 +150,6 @@ public class AnnotationFilterWidget extends Composite { if(isFilterHintText && (e.type != SWT.MouseUp || isSelectionEmpty)) { text.selectAll(); } - } }; nameFilterText.addListener(SWT.FocusIn, textSelectionOnFocusListener); 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 ed61fa9fcd1c9c7d1fd119b6d8fd9e5c35e23161..e7110b89671b90e734fa3dddf18664cb05d9bae9 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 @@ -46,7 +46,7 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating GREEN Hash: 13D2A858F846149E6EFD4C48B5A4DA2F + * @ConQAT.Rating GREEN Hash: 8F10A877EBCA135DFF2FD85900A3EAD7 */ public abstract class AbstractDecoratedTextCellDatabindingEditingSupport extends AbstractTextCellDatabindingEditingSupport { @@ -91,9 +91,11 @@ public abstract class AbstractDecoratedTextCellDatabindingEditingSupport extends /** * Sub-classes should overwrite to provide a text {@link IValidator}. * + * @param object + * Object for which to provide text {@link IValidator}. + * * @return <code>null</code>, by default. */ - @SuppressWarnings("unused") protected IValidator getTextValidator(Object object) { return null; } diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport.java index 1365fdc0e048c5ddb4198225103e1a56daf98430..04d95dcc09e3adcc7ee2d7e6e1f1a4345a6c2620 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport.java @@ -48,7 +48,7 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils; * @author hoelzl * @author $Author: mou $ * @version $Rev: 5274 $ - * @ConQAT.Rating GREEN Hash: F6052FB5D392E8FC0B8AF02F8669008F + * @ConQAT.Rating GREEN Hash: BC0D36A060AE96F7784E11F4E02E16E6 */ public abstract class AbstractDecoratedTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport extends AbstractTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport { @@ -94,9 +94,11 @@ public abstract class AbstractDecoratedTextCellWithTextStyledTextActionHandlerDa /** * Sub-classes should overwrite to provide a text {@link IValidator}. * + * @param object + * Object for which to provide text {@link IValidator}. + * * @return <code>null</code>, by default. */ - @SuppressWarnings("unused") protected IValidator getTextValidator(Object object) { return null; } 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 0ea663261749181d6d3f606258fab540de066610..922e6b33b02ee198adfe462b90b17fb911878065 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 @@ -122,7 +122,6 @@ public abstract class AbstractTextCellDatabindingEditingSupport extends EditingS "Illegal implementation: no binding returned."); getViewer().getColumnViewerEditor().addEditorActivationListener(activationListener); - } /** diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialog.java index e97a40f21edc48e6f56bd76fa1658cbcd6fd894c..01e278924059c7366429b32e14c68a451090873a 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialog.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ButtonDialog.java @@ -37,7 +37,7 @@ import org.eclipse.swt.widgets.Shell; * @author wenwenchen * @author $Author: ratiu $ * @version $Rev: 5186 $ - * @ConQAT.Rating GREEN Hash: F88F8A9E5677E70398FDF37956662477 + * @ConQAT.Rating GREEN Hash: E835C665671D57B2619E28232ABFC1F7 */ public class ButtonDialog extends Dialog { @@ -92,9 +92,6 @@ public class ButtonDialog extends Dialog { createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); } - /* - * (non-Javadoc) Method declared on Dialog. - */ /** {@inheritDoc} */ @Override protected Control createDialogArea(Composite parent) { diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java index 9727b04bd3e318f68ad9f1d75bbeac7bc91926ac..38fdde28f5c1548f22f4d9261cd309e21a131e5a 100755 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeMultiSelectDialog.java @@ -233,7 +233,6 @@ public class ElementTreeMultiSelectDialog extends TitleAreaDialog { gui.getSelectTreeViewer().add(selectedElements, path.getLastSegment()); gui.getElementTreeViewer().update(path.getLastSegment(), null); } - } catch(Exception e2) { e2.printStackTrace(); } @@ -253,7 +252,6 @@ public class ElementTreeMultiSelectDialog extends TitleAreaDialog { gui.getElementTreeViewer().update(path.getLastSegment(), null); } } - } catch(Exception e2) { e2.printStackTrace(); } diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java index a9d67e30f0e8bf2867a93fc70c3122daed87d136..1b4626cbc5c0aca5b12aae5436eee354a55ed622 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dialog/ElementTreeSingleSelectDialog.java @@ -49,7 +49,7 @@ import org.eclipse.swt.widgets.Shell; * @author mou * @author $Author$ * @version $Rev$ - * @ConQAT.Rating GREEN Hash: 8DB2FB4D76B8704E5FE13CB361E572F2 + * @ConQAT.Rating GREEN Hash: 8F165DEFB14FA23E90802923896C1142 */ public class ElementTreeSingleSelectDialog extends TitleAreaDialog { @@ -360,6 +360,8 @@ public class ElementTreeSingleSelectDialog extends TitleAreaDialog { * * @param element * the element which is currently selected + * + * @return Whether the {@code element} is accepted. */ public boolean acceptElement(Object element) { return true; diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/ViewerElementCompositionDropAdapter.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/ViewerElementCompositionDropAdapter.java index 51f26f586720753614b1592b5d34e9664535eedd..4d94149828693133fc5d82fe4f7b0ac82cfdbdab 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/ViewerElementCompositionDropAdapter.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/jface/ViewerElementCompositionDropAdapter.java @@ -112,5 +112,4 @@ public class ViewerElementCompositionDropAdapter extends ViewerDropAdapter { public Transfer[] getPreferredTransfers() { return getCompositionServiceTransfers(); } - } diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java index 8c3f5e2ea1587bac6e5371748b23e49f8cbdcc33..97e82f3886e9e61baa9254d6aa12ed1a81867e4e 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/ConnectionEditPartBase.java @@ -252,7 +252,6 @@ public abstract class ConnectionEditPartBase<T extends ConnectionSegmentBase> ex connection.setToolTip(new Label(IModelElementHandlerService.INSTANCE .getWrappedNameDescription(getModel()))); refreshBendpoints(); - } /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationConnectionEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationConnectionEditPartBase.java index 671eced4da32b1c09655c6813ba26501be5cffaf..67822305545fb445df0152233fc92deaa0b348a5 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationConnectionEditPartBase.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationConnectionEditPartBase.java @@ -35,7 +35,7 @@ import org.fortiss.tooling.base.ui.layout.IDiagramLayoutConfiguration; * @author $Author: hoelzl $ * @version $Rev: 18709 $ * @param <T> - * @ConQAT.Rating RED Hash: + * @ConQAT.Rating RED Hash: 2658B07745A8C6567BF8554A49171164 */ public abstract class AllocationConnectionEditPartBase<T extends ConnectionSegmentBase> extends ConnectionEditPartBase<T> { @@ -44,7 +44,6 @@ public abstract class AllocationConnectionEditPartBase<T extends ConnectionSegme protected AllocationConnectionEditPartBase(T modelElement, IDiagramLayoutConfiguration layoutConfiguration) { super(modelElement, layoutConfiguration); - } /** {@inheritDoc} */ @@ -55,12 +54,8 @@ public abstract class AllocationConnectionEditPartBase<T extends ConnectionSegme EditPart target = getTarget(); EditPart source = getSource(); - // prevent connections from being shown in the wrong hierarchical layers - if(target == null || source == null) { - figure.setVisible(false); - } else { - figure.setVisible(true); - } + // Prevent connections from being shown in the wrong hierarchical layers + figure.setVisible(target != null && source != null); } /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationElementEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationElementEditPartBase.java index 22bd8301d4e7bec0aec97bda3f441f541b6d4d62..588573ca30bc998749d807f38c106e00e5a85493 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationElementEditPartBase.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationElementEditPartBase.java @@ -58,7 +58,7 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService; * @author eder * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating GREEN Hash: BBF56133A9DAECA865EEC409990CC95E + * @ConQAT.Rating YELLOW Hash: 85EC44BA4D266213B269443441E4DF7D */ public abstract class AllocationElementEditPartBase<T extends ILayoutedModelElement & INamedCommentedElement> extends PositionedEditPartBase<T> { @@ -77,21 +77,19 @@ public abstract class AllocationElementEditPartBase<T extends ILayoutedModelElem } /** - * If {@link T} is the source of a allocation connection this method has to be implemented. - * Other wise return an empty list. + * If the template parameter {@code T} is the source of a allocation connection this method has + * to be implemented. Otherwise return an empty list. * * @return a list of all outgoing connections of this element */ - @SuppressWarnings("javadoc") protected abstract List<?> getModelSourceConnectionsInternal(); /** - * If {@link T} is the target of an allocation connection this method has to be implemented. - * Other wise return an empty list. + * If the template parameter {code T} is the target of an allocation connection this method has + * to be implemented. Otherwise return an empty list. * * @return a list of all incoming connections of this element */ - @SuppressWarnings("javadoc") protected abstract List<?> getModelTargetConnectionsInternal(); /** {@inheritDoc} */ @@ -142,7 +140,6 @@ public abstract class AllocationElementEditPartBase<T extends ILayoutedModelElem protected void createEditPolicies() { installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new AllocationDirectConnectionAndReconnectionEditPolicy(allocationObject)); - } /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationPositionService.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationPositionService.java index 2779bc2c4342ea95ad466c814015e9c62e8dedf1..e88a272e806da2974acf30c1a67c50f57dfd55c6 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationPositionService.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationPositionService.java @@ -81,7 +81,6 @@ public class AllocationPositionService implements IAllocationPositionService { public void setMinSourcePos(RootEditPart root, Point point) { AllocationPosBounds allocationPosBounds = checkAndCreate(root); allocationPosBounds.minSourcePos = point; - } /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationSubDiagramEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationSubDiagramEditPartBase.java index 5d64491a56a07b5b48e20f71eec5622c9fcb8036..2f1300636f5ddc850f12ed05ba3552592c78d56d 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationSubDiagramEditPartBase.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/allocation/AllocationSubDiagramEditPartBase.java @@ -72,7 +72,7 @@ import org.fortiss.tooling.kernel.utils.EcoreUtils; * @author $Author: hoelzl $ * @version $Rev: 18709 $ * @param <T> - * @ConQAT.Rating GREEN Hash: E029234095C8F25DA1CD9A78EC34FA65 + * @ConQAT.Rating RED Hash: 6ADFFD02E6D06D79D56C6E7FC076E7B3 */ public abstract class AllocationSubDiagramEditPartBase<T extends INamedCommentedElement> extends GraphicalEditPartBase<T> implements NodeEditPart { @@ -240,7 +240,6 @@ public abstract class AllocationSubDiagramEditPartBase<T extends INamedCommented IAllocationPositionService.INSTANCE.getSourceAllocationBounds(root); return new Rectangle(reduce.x, sourceBounds.y + sourceBounds.height, reduce.width + minX, reduce.height + 20); - } // if sub diagram is the source diagram IAllocationPositionService.INSTANCE.setMinSourcePos(root, new Point(minX, minY)); @@ -320,7 +319,6 @@ public abstract class AllocationSubDiagramEditPartBase<T extends INamedCommented for(int i = 0; i < list.size(); i++) { ((EditPart)list.get(i)).refresh(); } - } /** @@ -445,5 +443,4 @@ public abstract class AllocationSubDiagramEditPartBase<T extends INamedCommented public ConnectionAnchor getTargetConnectionAnchor(Request request) { return null; } - } diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/AllocationDirectConnectionAndReconnectionEditPolicy.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/AllocationDirectConnectionAndReconnectionEditPolicy.java index 02c1641c3dbc96ced52025e07dcb381689333126..6aed45302e10fe9ca54dc47b57c40bcb57eb2361 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/AllocationDirectConnectionAndReconnectionEditPolicy.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/policy/AllocationDirectConnectionAndReconnectionEditPolicy.java @@ -62,6 +62,5 @@ public class AllocationDirectConnectionAndReconnectionEditPolicy extends AllocationConnectCommand cmd = new AllocationConnectCommand(context); request.setStartCommand(cmd); return cmd; - } } diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IDiagramLayoutConfiguration.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IDiagramLayoutConfiguration.java index ad9ecac2557172af8eaac3bc1752eed6e76dc8c2..7ad3250942a029df580cbf2346efcb592e24fe3b 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IDiagramLayoutConfiguration.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/layout/IDiagramLayoutConfiguration.java @@ -98,5 +98,4 @@ public interface IDiagramLayoutConfiguration { /** Alters the given request to the coordinates of the element feedback. */ void alterElementMoveAndResizeFeedbackRequest(ChangeBoundsRequest request, ElementEditPartBase<? extends ILayoutedModelElement> elementEditPart); - } 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 e34c5947508b12e5176f44b8ae98d5b85dcf0fe9..7626e7d180978dfa09f62db084bb014795b96ee2 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 @@ -102,7 +102,6 @@ public abstract class CheckBoxLabelProvider extends ColumnLabelProvider { return getImageRegistry().get(DISABLED_CHECKED_KEY); } return getImageRegistry().get(DISABLED_UNCHECKED_KEY); - } /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/LayoutDataUIUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/LayoutDataUIUtils.java index 47f19205440a7eef1396da5d3eeee9e35041c1b2..d82b6828c63de3a31f335bf30df7d1f392405c1a 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/LayoutDataUIUtils.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/LayoutDataUIUtils.java @@ -76,7 +76,7 @@ import org.fortiss.tooling.base.utils.LayoutDataUtils; * @author hummel * @author $Author$ * @version $Rev$ - * @ConQAT.Rating GREEN Hash: 8D9976C616345F19D6486DFB5BB2C2C6 + * @ConQAT.Rating GREEN Hash: 2DCE07CDBDBD8C7CE4E6A54626322057 */ public class LayoutDataUIUtils { @@ -256,7 +256,6 @@ public class LayoutDataUIUtils { Points pts = getConnectionPoints(lobject); pts.getPoints().remove(index); setPoints(lobject, CONNECTION_POINTS, pts); - } /** Move bend points along with a group of selected elements */ @@ -285,7 +284,6 @@ public class LayoutDataUIUtils { (connection.getTarget().getParent().getSelected() != SELECTED_NONE)) { changeAllConnectionPoints(connection.getModel(), deltaX, deltaY); } - } } } @@ -316,7 +314,9 @@ public class LayoutDataUIUtils { public static void bendpointGroupResize(ILayoutedModelElement layouted, List parts, int deltaWidth, int deltaHeight) { + // get(0): Size of list is guaranteed to be 1 if(parts.size() == 1 && parts.get(0) instanceof ElementEditPartBase) { + // get(0): Size of list is guaranteed to be 1 ElementEditPartBase element = (ElementEditPartBase)parts.get(0); Point partPos = getPosition(layouted, "pos"); @@ -351,7 +351,6 @@ public class LayoutDataUIUtils { else if(p.getX() > partPos.getX() + partDim.getWidth() - deltaWidth) { changeConnectionPoint(connection.getModel(), index, p.getX() + deltaWidth, p.getY() + deltaHeight / 2); - } // below EditPart else if(p.getY() > partPos.getY() + partDim.getHeight() - deltaHeight) { diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/PropertiesViewUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/PropertiesViewUtils.java index 87a6fb5d4eeba40b6f144106914e1c737749f0c6..308fa6f33ae1070222fdd8553f07b133ac050af2 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/PropertiesViewUtils.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/PropertiesViewUtils.java @@ -55,7 +55,6 @@ public class PropertiesViewUtils { // view acts as a replacement for many properties) activePage.showView(ID_PROP_SHEET, null, VIEW_CREATE); } - } catch(PartInitException e) { LoggingUtils.info(ToolingBaseUIActivator.getDefault(), "No property section to display."); diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java index 0980a02b8937f1c4178a0fe735be6f86700ac850..8082f0037e99b35c8e40ab046bf33dfce87e72c9 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/utils/TableViewerUtils.java @@ -244,6 +244,5 @@ public class TableViewerUtils { } return null; } - } } diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationValueService.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationValueService.java index c221653e7e52f18e1102344376507d6d88016987..31bea70e85b718c46baf4db59f9913246ab5727a 100644 --- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationValueService.java +++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/AnnotationValueService.java @@ -167,7 +167,6 @@ public class AnnotationValueService extends // Register annotation provider <-> annotation specification mapping entry.addNewSpecification(annotationProvider, annotatedSpecification); } - } /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/IAnnotationValueService.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/IAnnotationValueService.java index a5108f257bc05fd76cf3c76542af29a44efd0be2..122e65e1e90473437b26f4c852c38189d5facd98 100644 --- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/IAnnotationValueService.java +++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/IAnnotationValueService.java @@ -61,5 +61,4 @@ public interface IAnnotationValueService { * </p> */ public void instantiateAnnotations(IModelElement element); - } diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DerivedAnnotationValueProviderBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DerivedAnnotationValueProviderBase.java index 5c4d59b14bcc624b0285548bd01c46ba0306d22f..553b4c561e2eb16eae37bef90e0b56b2841c4364 100644 --- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DerivedAnnotationValueProviderBase.java +++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DerivedAnnotationValueProviderBase.java @@ -88,7 +88,6 @@ public abstract class DerivedAnnotationValueProviderBase<T extends IDerivedAnnot this.derivedKey = derivedKey; keys.addAll(structuralFeatureDescriptorMap.keySet()); keys.add(derivedKey); - } /** @@ -116,7 +115,6 @@ public abstract class DerivedAnnotationValueProviderBase<T extends IDerivedAnnot this.isEditableByUser = derivedValueIsEditable; keys.addAll(structuralFeatureDescriptorMap.keySet()); keys.add(derivedKey); - } /** diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DynamicInstanceAnnotationValueProviderBase.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DynamicInstanceAnnotationValueProviderBase.java index 6a3b57e5307b13bbd9e579b014fa6b1a34c4fb63..86e7cac75207c6791307f3d0bdc3c966846f0809 100644 --- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DynamicInstanceAnnotationValueProviderBase.java +++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/DynamicInstanceAnnotationValueProviderBase.java @@ -132,7 +132,6 @@ public abstract class DynamicInstanceAnnotationValueProviderBase<T extends IAnno EMap<String, V> map = super.getAnnotationValue(specification, DEFAULT_KEY); map.put(instanceKey, value); } - } /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/IAnnotationValueProvider.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/IAnnotationValueProvider.java index 72654c4833bdc2bac484007743366971a7318210..21bb885061cd2b1a9497971b7dcefdbe4319a7fe 100644 --- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/IAnnotationValueProvider.java +++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/annotation/valueprovider/IAnnotationValueProvider.java @@ -190,5 +190,4 @@ public interface IAnnotationValueProvider<T extends IAnnotatedSpecification> ext * </p> */ public boolean allowsDynamicAnnotationInstances(); - } diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java index 67a0ae1b0666beee1a288d11d193a4a1a89e7a00..e0507c95c836ade72aaa51dff34f9b9774ba9e5e 100644 --- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java +++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/layout/DefaultLayoutConstants.java @@ -65,5 +65,4 @@ public class DefaultLayoutConstants { * vertically. */ public static final int SHIFT_OFFSET = 5; - } diff --git a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/element/impl/IModelElementStaticImpl.java b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/element/impl/IModelElementStaticImpl.java index a0df4a33207a5a8b32854e42ab33c452f4e6e91d..598ea4a2661482f218e54206452e7a917300d744 100644 --- a/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/element/impl/IModelElementStaticImpl.java +++ b/org.fortiss.tooling.base/trunk/src/org/fortiss/tooling/base/model/element/impl/IModelElementStaticImpl.java @@ -41,6 +41,5 @@ public class IModelElementStaticImpl { public static void addSpecification(IModelElement iModelElement, IModelElementSpecification spec) { iModelElement.getSpecifications().add(spec); - } } diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/AllocationEditPartFactoryService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/AllocationEditPartFactoryService.java index bc1b4ebe5e9c6109d4763683f7ee474e08712d7d..a59a2b6c57a82c395f2d0b3be9ded49d2e51ecc5 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/AllocationEditPartFactoryService.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/AllocationEditPartFactoryService.java @@ -98,7 +98,6 @@ public class AllocationEditPartFactoryService extends } return null; - } /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java index fb815a716af89d1c93b6044b0875ddf4b5c7b597..ed5216e34d1f0f5d1e5606cea56e18ccedf39f62 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/actions/DeleteAction.java @@ -95,7 +95,6 @@ public class DeleteAction extends EObjectActionBase<EObject> { }); } } - } /** Computes enabled state of the delete action. */ diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/databinding/EObjectObservableValue.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/databinding/EObjectObservableValue.java index 2756c4b7cb109bab4a98e6ab39f4872bc579b017..7af00bb8f21eab6aba0705188bdc2fcf980baee6 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/databinding/EObjectObservableValue.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/databinding/EObjectObservableValue.java @@ -125,5 +125,4 @@ public class EObjectObservableValue extends AbstractObservableValue { } return ((EReference)structuralFeature).getEReferenceType().getInstanceClass(); } - } diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PrototypeServiceIntrospectionDetailsUIHandler.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PrototypeServiceIntrospectionDetailsUIHandler.java index 8ae66c5e46af47ad6c217e86c45b73ead4721235..15060e09a6064ea1c21502cbfbddf0726687f596 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PrototypeServiceIntrospectionDetailsUIHandler.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/PrototypeServiceIntrospectionDetailsUIHandler.java @@ -118,7 +118,6 @@ public final class PrototypeServiceIntrospectionDetailsUIHandler extends } return null; } - }; } diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TableViewerPatternFilter.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TableViewerPatternFilter.java index d5ec3950bd67c4b52198c92cf6cd9033c1878e11..3de529fa1dbd1a5408f3a9d0f0797ee5bd0ecc91 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TableViewerPatternFilter.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/introspection/details/handler/TableViewerPatternFilter.java @@ -29,7 +29,7 @@ import org.eclipse.ui.dialogs.PatternFilter; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating GREEN Hash: 28A165361BBD500BC5BC54BCF008BF0E + * @ConQAT.Rating GREEN Hash: 2FABFD11E9DCF76556A9A3770C266A9C */ class TableViewerPatternFilter extends PatternFilter { /** {@inheritDoc} */ @@ -47,8 +47,16 @@ class TableViewerPatternFilter extends PatternFilter { return isMatch; } - /** Matches the label in the given column. */ - @SuppressWarnings("unused") + /** + * Matches the label in the given column. + * + * @param labelText + * Label text to be matched. + * @param columnIndex + * Index of column for which label text has to be matched. + * + * @return {@code true} in case of match. + */ protected boolean basicMatch(String labelText, int columnIndex) { return wordMatches(labelText); } diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/perspective/StoragePerspective.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/perspective/StoragePerspective.java index 029a516bae62fce4703d300fd834a2c2d803d53d..4f27b8d4f5526230930ee534aedf14838e3e2f52 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/perspective/StoragePerspective.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/perspective/StoragePerspective.java @@ -28,7 +28,7 @@ import org.eclipse.ui.IPerspectiveFactory; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating GREEN Hash: AA81B9BD12C7D183167EFED262737B53 + * @ConQAT.Rating RED Hash: D2F73B126E1758D648AAB2FBE79C432E */ public class StoragePerspective implements IPerspectiveFactory { @@ -36,7 +36,6 @@ public class StoragePerspective implements IPerspectiveFactory { public static final String ID = StoragePerspective.class.getName(); /** {@inheritDoc} */ - @SuppressWarnings("deprecation") @Override public void createInitialLayout(IPageLayout layout) { IFolderLayout left = diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java index 7ae2d3c646195c47873170cfcf71dbd5c31992f1..931a160456c9ab59fb3ee1d69629331b08d2b151 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/presentation/ModelElementLabelProvider.java @@ -100,7 +100,6 @@ public class ModelElementLabelProvider extends ColumnLabelProvider { Math.min(((imgData.getPixel(x, y) & 0x000000ff) >> 0x00) + 0x28, 0xff) << 0x00; mergedImg.setPixel(x, y, r | g | b); mergedImg.setAlpha(x, y, imgData.getAlpha(x, y)); - } } return new Image(device, mergedImg); diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/CopyPasteUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/CopyPasteUtils.java index 029532258418f5f2d3058c659df9832f255bc3f7..1535d52b7beb97b222ecf4c211c5899b297bf269 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/CopyPasteUtils.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/CopyPasteUtils.java @@ -158,7 +158,6 @@ public class CopyPasteUtils { ((ExtendableMultiPageEditor)activePart).getEditedObject(), target)) return false; } - } if(IElementCompositorService.INSTANCE.canCompose(target, insertObj, context)) { return true; diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/PropertiesConstantUtils.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/PropertiesConstantUtils.java index f9529c9f8f1eec8f26b914e143bb0eaa192c5759..26df5c393ec9adb165719aaf13626e485b829d54 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/PropertiesConstantUtils.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/PropertiesConstantUtils.java @@ -61,5 +61,4 @@ public class PropertiesConstantUtils { /** The ID of the internal properties tab. */ public static final String INTERNAL_PROPERTY_TAB_ID = "org.fortiss.tooling.kernel.ui.property.tab.internal"; - } diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/UndoRedoImpl.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/UndoRedoImpl.java index e5ec02c1ea172d7c35686447e52d093ee7de008f..6923936ea16c4fe22cb7a26a66a7bb220ccdf22c 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/UndoRedoImpl.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/util/UndoRedoImpl.java @@ -90,7 +90,6 @@ public class UndoRedoImpl implements KeyListener, ModifyListener { public boolean hasRedo() { return !redo.isEmpty(); } - } /** diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConnectionCompositor.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConnectionCompositor.java index d63163fab584835d5d7ccc3e619898698873666a..aeace42afdefa4de7946622bb42b1c562bc4b37b 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConnectionCompositor.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/IConnectionCompositor.java @@ -47,7 +47,7 @@ import org.fortiss.tooling.kernel.service.base.IEObjectAware2; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating GREEN Hash: 9C3C8D19BABE3F46521827FA0C527541 + * @ConQAT.Rating GREEN Hash: A69BF314AFF04714C93BFF23E881FC31 */ public interface IConnectionCompositor<P extends EObject, S extends EObject, T extends EObject> extends IEObjectAware2<S, T> { @@ -73,6 +73,9 @@ public interface IConnectionCompositor<P extends EObject, S extends EObject, T e * the parent of the connection. * @param context * context information for the connection. May be null. + * + * @return {@code true} if the connect operation has been performed, {@code false} otherwise + * (e.g., the user has cancelled). */ boolean connect(S source, T target, P parent, IConnectionCompositionContext context); diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/RemoveUnknownFeatureMigrationProviderBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/RemoveUnknownFeatureMigrationProviderBase.java index 86662995460b1b5945c343dbd008afe4b73a60a7..f0b6c78cfab8c42616c26ba6830ff55dd6677127 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/RemoveUnknownFeatureMigrationProviderBase.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/extension/base/RemoveUnknownFeatureMigrationProviderBase.java @@ -133,5 +133,4 @@ public abstract class RemoveUnknownFeatureMigrationProviderBase implements IMigr return null; } - } diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/DummyTopLevelElement.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/DummyTopLevelElement.java index 9111b39e4ed6d192728032f8b713eee0144ebe91..5d345d24d34985db30ce30bbf2f9f907371d9515 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/DummyTopLevelElement.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/DummyTopLevelElement.java @@ -124,7 +124,6 @@ final class DummyTopLevelElement implements ITopLevelElement { @Override public void doSaveAndResetLastChangeWasIntended(IProgressMonitor monitor) { // ignore - } /** {@inheritDoc} */ diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java index 5f0f747b50cfb151b9c61680ba326f7444c7cb01..084a8e6a81473b668ca524ad55ca8b4669f1e84d 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/EclipseResourceStorageProvider.java @@ -254,7 +254,6 @@ public class EclipseResourceStorageProvider implements IEclipseResourceStorageSe } } }); - } } } diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConnectionCompositorService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConnectionCompositorService.java index 644573e476f22f601ea7fd6afbcd1dc5908e8cc6..6d1c657306b972f45260c98297919dd1de35d0c3 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConnectionCompositorService.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/IConnectionCompositorService.java @@ -35,7 +35,7 @@ import org.fortiss.tooling.kernel.internal.ConnectionCompositorService; * @author hoelzl * @author $Author$ * @version $Rev$ - * @ConQAT.Rating GREEN Hash: F5F42D020F480ED93C904F4EF802866A + * @ConQAT.Rating GREEN Hash: CB088BC7AB8F3FD044A2774FCF348E6A */ public interface IConnectionCompositorService { @@ -63,6 +63,8 @@ public interface IConnectionCompositorService { * the parent of the connection. * @param context * context information for the connection. May be null. + * + * @return {@code true} iff the connect operation has successfully been performed. */ boolean connect(EObject source, EObject target, EObject parent, IConnectionCompositionContext context); diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/IPersistencyServiceListener.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/IPersistencyServiceListener.java index 654861b10e9ff719b3a6712caee5e85ecfeed06d..7824331e3de6ebb1d247309c930bb01cf8125f0e 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/IPersistencyServiceListener.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/service/listener/IPersistencyServiceListener.java @@ -49,5 +49,4 @@ public interface IPersistencyServiceListener { * changed. */ void topLevelElementContentChanged(ITopLevelElement element); - } diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/KernelModelElementUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/KernelModelElementUtils.java index e95f05c75a4493f1ef014e353c072bd6da1411f6..bd27276f0d7222e482dd71d47533a289a7c3ac2b 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/KernelModelElementUtils.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/KernelModelElementUtils.java @@ -168,7 +168,6 @@ public final class KernelModelElementUtils { public static EObject findReferencedElement(IIdLabeledReference reference) { return findElementById(reference.getIdReference(), IPersistencyService.INSTANCE .getTopLevelElementFor(reference).getRootModelElement()); - } /**