From 4cc796b367756f3a4a4497164215879f52eeab91 Mon Sep 17 00:00:00 2001 From: Camille Letavernier Date: Tue, 19 May 2020 12:12:20 +0200 Subject: Bug 563330: Format & Clean-up Change-Id: Ic1862d07f3a484e9228373da0d7d80ce4826f310 Signed-off-by: Camille Letavernier --- .../common/editparts/BorderItemNameEditPart.java | 283 +++++++++++---------- .../editparts/EditableLabelForNodeEditPart.java | 26 +- 2 files changed, 169 insertions(+), 140 deletions(-) (limited to 'plugins') diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/BorderItemNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/BorderItemNameEditPart.java index 9678223e013..be5b5153da2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/BorderItemNameEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/BorderItemNameEditPart.java @@ -53,6 +53,13 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -63,13 +70,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.LabelAlignmentEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator.CellEditorLocatorAccess; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition; @@ -101,21 +101,24 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe /** * direct edition mode (default, undefined, registered editor, etc.) + * * @generated */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; /** * configuration from a registered edit dialog + * * @generated */ protected IDirectEditorConfiguration configuration; - + public BorderItemNameEditPart(View view) { super(view); } + @Override protected void createDefaultEditPolicies() { super.createDefaultEditPolicies(); installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy()); @@ -128,60 +131,63 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe protected boolean getDefaultLabelVisibility() { return true; } + + @Override public IBorderItemLocator getBorderItemLocator() { IFigure parentFigure = getFigure().getParent(); - if(parentFigure != null && parentFigure.getLayoutManager() != null) { + if (parentFigure != null && parentFigure.getLayoutManager() != null) { Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure()); - return (IBorderItemLocator)constraint; + return (IBorderItemLocator) constraint; } return null; } + @Override public void refreshBounds() { - int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); - int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); - int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); - int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); + int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue(); + int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue(); + int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue(); + int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue(); getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height)); } protected String getLabelTextHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getText(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getText(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getText(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getText(); } else { - return ((Label)figure).getText(); + return ((Label) figure).getText(); } } protected void setLabelTextHelper(IFigure figure, String text) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setText(text); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setText(text); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setText(text); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setText(text); } else { - ((Label)figure).setText(text); + ((Label) figure).setText(text); } } protected Image getLabelIconHelper(IFigure figure) { - if(figure instanceof WrappingLabel) { - return ((WrappingLabel)figure).getIcon(); - } else if(figure instanceof ILabelFigure) { - return ((ILabelFigure)figure).getIcon(); + if (figure instanceof WrappingLabel) { + return ((WrappingLabel) figure).getIcon(); + } else if (figure instanceof ILabelFigure) { + return ((ILabelFigure) figure).getIcon(); } else { - return ((Label)figure).getIcon(); + return ((Label) figure).getIcon(); } } protected void setLabelIconHelper(IFigure figure, Image icon) { - if(figure instanceof WrappingLabel) { - ((WrappingLabel)figure).setIcon(icon); - } else if(figure instanceof ILabelFigure) { - ((ILabelFigure)figure).setIcon(icon); + if (figure instanceof WrappingLabel) { + ((WrappingLabel) figure).setIcon(icon); + } else if (figure instanceof ILabelFigure) { + ((ILabelFigure) figure).setIcon(icon); } else { - ((Label)figure).setIcon(icon); + ((Label) figure).setIcon(icon); } } @@ -196,10 +202,12 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe /** * @generated */ + @Override protected List getModelChildren() { return Collections.EMPTY_LIST; } + @Override public IGraphicalEditPart getChildBySemanticHint(String semanticHint) { return null; } @@ -214,13 +222,13 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe protected Image getLabelIcon() { EObject parserElement = getParserElement(); - if(parserElement == null) { + if (parserElement == null) { return null; } List views = DiagramEditPartsUtil.findViews(parserElement, getViewer()); - for(View view : views) { - if(AppearanceHelper.showElementIcon(view)) { - return org.eclipse.papyrus.uml.diagram.common.Activator.getDefault().getImage(parserElement.eClass()); + for (View view : views) { + if (AppearanceHelper.showElementIcon(view)) { + return org.eclipse.papyrus.uml.diagram.common.Activator.getDefault().getImage(parserElement.eClass()); } } return null; @@ -229,29 +237,31 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe protected String getLabelText() { String text = null; EObject parserElement = getParserElement(); - if(parserElement != null && getParser() != null) { + if (parserElement != null && getParser() != null) { text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue()); } - if(text == null || text.length() == 0) { + if (text == null || text.length() == 0) { text = defaultText; } return text; } + @Override public void setLabelText(String text) { setLabelTextHelper(getFigure(), text); Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } + @Override public String getEditText() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return ""; //$NON-NLS-1$ } return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue()); @@ -261,20 +271,21 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe return getParser() != null; } + @Override public ICellEditorValidator getEditTextValidator() { return new ICellEditorValidator() { @Override public String isValid(final Object value) { - if(value instanceof String) { + if (value instanceof String) { final EObject element = getParserElement(); final IParser parser = getParser(); try { - IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() { + IParserEditStatus valid = (IParserEditStatus) getEditingDomain().runExclusive(new RunnableWithResult.Impl() { @Override public void run() { - setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value)); + setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value)); } }); return valid.getCode() == IParserEditStatus.EDITABLE ? null : valid.getMessage(); @@ -288,21 +299,24 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe }; } + @Override public IContentAssistProcessor getCompletionProcessor() { - if(getParserElement() == null || getParser() == null) { + if (getParserElement() == null || getParser() == null) { return null; } return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement())); } + @Override public ParserOptions getParserOptions() { return ParserOptions.NONE; } + @Override public IParser getParser() { - if(parser == null) { - parser =ParserService.getInstance().getParser(new DefaultParserHintAdapter(getNotationView().getDiagram(), resolveSemanticElement(), getNotationView().getType())); - if(parser == null) { + if (parser == null) { + parser = ParserService.getInstance().getParser(new DefaultParserHintAdapter(getNotationView().getDiagram(), resolveSemanticElement(), getNotationView().getType())); + if (parser == null) { parser = new NamedElementLabelParser(); } } @@ -310,7 +324,7 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe } protected DirectEditManager getManager() { - if(manager == null) { + if (manager == null) { setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), getTextCellEditorLocator(this))); } return manager; @@ -331,14 +345,14 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe } protected void performDirectEdit(Point eventLocation) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint()); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint()); } } private void performDirectEdit(char initialCharacter) { - if(getManager() instanceof TextDirectEditManager) { - ((TextDirectEditManager)getManager()).show(initialCharacter); + if (getManager() instanceof TextDirectEditManager) { + ((TextDirectEditManager) getManager()).show(initialCharacter); } else { performDirectEdit(); } @@ -348,54 +362,54 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe if (source.getFigure() instanceof IMultilineEditableFigure) { return new MultilineCellEditorLocator( (IMultilineEditableFigure) source.getFigure()); - } - else { + } else { return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source); } } - + + @Override protected void performDirectEditRequest(Request request) { final Request theRequest = request; - if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { + if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) { directEditionMode = getDirectEditionType(); } - switch(directEditionMode) { + switch (directEditionMode) { case IDirectEdition.NO_DIRECT_EDITION: // no direct edition mode => does nothing return; case IDirectEdition.EXTENDED_DIRECT_EDITOR: updateExtendedEditorConfiguration(); - if(configuration == null || configuration.getLanguage() == null) { + if (configuration == null || configuration.getLanguage() == null) { // Create default edit manager setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), getTextCellEditorLocator(this))); performDefaultDirectEditorEdit(theRequest); } else { configuration.preEditAction(resolveSemanticElement()); Dialog dialog = null; - if(configuration instanceof ICustomDirectEditorConfiguration) { - setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this)); + if (configuration instanceof ICustomDirectEditorConfiguration) { + setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this)); initializeDirectEditManager(theRequest); return; - } else if(configuration instanceof IPopupEditorConfiguration) { - IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this); + } else if (configuration instanceof IPopupEditorConfiguration) { + IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this); helper.showEditor(); return; - } else if(configuration instanceof IAdvancedEditorConfiguration) { - dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); - } else if(configuration instanceof IDirectEditorConfiguration) { + } else if (configuration instanceof IAdvancedEditorConfiguration) { + dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement())); + } else if (configuration instanceof IDirectEditorConfiguration) { dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()), configuration); } else { return; } final Dialog finalDialog = dialog; - if(Window.OK == dialog.open()) { + if (Window.OK == dialog.open()) { TransactionalEditingDomain domain = getEditingDomain(); RecordingCommand command = new RecordingCommand(domain, "Edit Label") { @Override protected void doExecute() { - configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue()); + configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue()); } }; domain.getCommandStack().execute(command); @@ -417,9 +431,9 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe @Override public void run() { - if(isActive() && isEditable()) { - if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); } else { performDirectEdit(); @@ -432,6 +446,7 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe } } + @Override protected void refreshVisuals() { super.refreshVisuals(); refreshLabel(); @@ -443,12 +458,12 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe protected void refreshLabel() { EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY); - if(maskLabelPolicy == null) { + if (maskLabelPolicy == null) { maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } - if(maskLabelPolicy == null) { - View view = (View)getModel(); - if(view.isVisible()) { + if (maskLabelPolicy == null) { + View view = (View) getModel(); + if (view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); setLabelIconHelper(getFigure(), getLabelIcon()); } else { @@ -457,63 +472,67 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe } } Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE); - if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback(); + if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback(); } Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE); - if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) { - ((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback(); + if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) { + ((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback(); } } protected void refreshUnderline() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline()); } - if(resolveSemanticElement() instanceof Feature) { - if(((Feature)resolveSemanticElement()).isStatic()) { - ((WrappingLabel)getFigure()).setTextUnderline(true); + if (resolveSemanticElement() instanceof Feature) { + if (((Feature) resolveSemanticElement()).isStatic()) { + ((WrappingLabel) getFigure()).setTextUnderline(true); } else { - ((WrappingLabel)getFigure()).setTextUnderline(false); + ((WrappingLabel) getFigure()).setTextUnderline(false); } } } protected void refreshStrikeThrough() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null && getFigure() instanceof WrappingLabel) { - ((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough()); + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null && getFigure() instanceof WrappingLabel) { + ((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough()); } } + @Override protected void refreshFont() { - FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); - if(style != null) { + FontStyle style = (FontStyle) getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle()); + if (style != null) { FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL)); setFont(fontData); } } + @Override protected void setFontColor(Color color) { getFigure().setForegroundColor(color); } + @Override protected void addSemanticListeners() { - if(getParser() instanceof ISemanticParser) { + if (getParser() instanceof ISemanticParser) { EObject element = resolveSemanticElement(); - parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element); - for(int i = 0; i < parserElements.size(); i++) { - addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$ + parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element); + for (int i = 0; i < parserElements.size(); i++) { + addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$ } } else { super.addSemanticListeners(); } } + @Override protected void removeSemanticListeners() { - if(parserElements != null) { - for(int i = 0; i < parserElements.size(); i++) { + if (parserElements != null) { + for (int i = 0; i < parserElements.size(); i++) { removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$ } } else { @@ -521,8 +540,9 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe } } + @Override protected AccessibleEditPart getAccessibleEditPart() { - if(accessibleEP == null) { + if (accessibleEP == null) { accessibleEP = new AccessibleGraphicalEditPart() { @Override @@ -540,16 +560,16 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe /** * Returns the kind of associated editor for direct edition. - * + * * @return an int corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition * @generated */ public int getDirectEditionType() { - if(checkExtendedEditor()) { + if (checkExtendedEditor()) { initExtendedEditorConfiguration(); return IDirectEdition.EXTENDED_DIRECT_EDITOR; } - if(checkDefaultEdition()) { + if (checkDefaultEdition()) { return IDirectEdition.DEFAULT_DIRECT_EDITOR; } // not a named element. no specific editor => do nothing @@ -558,12 +578,12 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe /** * Checks if an extended editor is present. - * + * * @return true if an extended editor is present. * @generated */ protected boolean checkExtendedEditor() { - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement()); } return false; @@ -571,7 +591,7 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe /** * Checks if a default direct edition is available - * + * * @return true if a default direct edition is available * @generated */ @@ -581,12 +601,13 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe /** * Initializes the extended editor configuration + * * @generated */ protected void initExtendedEditorConfiguration() { - if(configuration == null) { + if (configuration == null) { final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("")) { + if (languagePreferred != null && !languagePreferred.equals("")) { configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()); } else { configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement()); @@ -596,20 +617,23 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe /** * Updates the preference configuration + * * @generated */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName()); - if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { + if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) { configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()); - } else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { + } else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) { configuration = null; } } /** * Performs the direct edit usually used by GMF editors. - * @param theRequest the direct edit request that starts the direct edit system + * + * @param theRequest + * the direct edit request that starts the direct edit system * @generated */ protected void performDefaultDirectEditorEdit(final Request theRequest) { @@ -619,12 +643,12 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe @Override public void run() { - if(isActive() && isEditable()) { - if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { - Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); + if (isActive() && isEditable()) { + if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) { + Character initialChar = (Character) theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR); performDirectEdit(initialChar.charValue()); - } else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { - DirectEditRequest editRequest = (DirectEditRequest)theRequest; + } else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) { + DirectEditRequest editRequest = (DirectEditRequest) theRequest; performDirectEdit(editRequest.getLocation()); } else { performDirectEdit(); @@ -637,26 +661,28 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe } } + @Override protected void handleNotificationEvent(Notification event) { Object feature = event.getFeature(); - if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { - Integer c = (Integer)event.getNewValue(); + if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) { + Integer c = (Integer) event.getNewValue(); setFontColor(DiagramColorRegistry.getInstance().getColor(c)); - } else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) { refreshUnderline(); - } else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) { refreshStrikeThrough(); - } else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { + } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) + || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) { refreshFont(); } else { - if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { + if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) { refreshLabel(); } - if(getParser() instanceof ISemanticParser) { - ISemanticParser modelParser = (ISemanticParser)getParser(); - if(modelParser.areSemanticElementsAffected(null, event)) { + if (getParser() instanceof ISemanticParser) { + ISemanticParser modelParser = (ISemanticParser) getParser(); + if (modelParser.areSemanticElementsAffected(null, event)) { removeSemanticListeners(); - if(resolveSemanticElement() != null) { + if (resolveSemanticElement() != null) { addSemanticListeners(); } refreshLabel(); @@ -669,6 +695,7 @@ public class BorderItemNameEditPart extends FloatingLabelEditPart implements ITe /** * @generated */ + @Override protected IFigure createFigure() { IFigure label = createFigurePrim(); defaultText = getLabelTextHelper(label); diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/EditableLabelForNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/EditableLabelForNodeEditPart.java index 0426e07548c..907b8223a73 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/EditableLabelForNodeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/EditableLabelForNodeEditPart.java @@ -51,6 +51,14 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; +import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; +import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; +import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; +import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.Activator; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.IAdvancedEditorConfiguration; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration; @@ -61,14 +69,6 @@ import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.ILabelEditor import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.ui.IPopupEditorHelper; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.utils.IDirectEditorsIds; -import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper; -import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel; -import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.directedit.locator.CellEditorLocatorAccess; import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy; import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager; @@ -102,7 +102,7 @@ public class EditableLabelForNodeEditPart extends PapyrusCompartmentEditPart imp /** * direct edition mode (default, undefined, registered editor, etc.) - * + * */ protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR; @@ -285,6 +285,7 @@ public class EditableLabelForNodeEditPart extends PapyrusCompartmentEditPart imp return ParserOptions.NONE; } + @Override public IParser getParser() { if (parser == null) { @@ -582,7 +583,7 @@ public class EditableLabelForNodeEditPart extends PapyrusCompartmentEditPart imp /** * Initializes the extended editor configuration - * + * */ protected void initExtendedEditorConfiguration() { if (configuration == null) { @@ -597,7 +598,7 @@ public class EditableLabelForNodeEditPart extends PapyrusCompartmentEditPart imp /** * Updates the preference configuration - * + * */ protected void updateExtendedEditorConfiguration() { String languagePreferred = Activator.getDefault().getPreferenceStore().getString( @@ -611,7 +612,7 @@ public class EditableLabelForNodeEditPart extends PapyrusCompartmentEditPart imp /** * Performs the direct edit usually used by GMF editors. - * + * * @param theRequest * the direct edit request that starts the direct edit system */ @@ -690,6 +691,7 @@ public class EditableLabelForNodeEditPart extends PapyrusCompartmentEditPart imp super.handleNotificationEvent(event); } + @Override protected IFigure createFigure() { IFigure label = null; if (getParent() instanceof ContainerNodeEditPart) { -- cgit v1.2.3