diff options
author | Quentin Le Menez | 2018-01-09 10:09:46 +0000 |
---|---|---|
committer | Quentin Le Menez | 2018-01-09 13:18:15 +0000 |
commit | d98116b5b376f18b6cf626ba4158a35fe9a4a64e (patch) | |
tree | 4458c9c5ada0a216b385813a56ea9a9b8c7b6509 /plugins/uml/org.eclipse.papyrus.uml.import/src/org | |
parent | 453e99bc2dcbd5fabad100f9d0d5f682013c3b19 (diff) | |
download | org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.tar.gz org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.tar.xz org.eclipse.papyrus-d98116b5b376f18b6cf626ba4158a35fe9a4a64e.zip |
Bug 515367 - [releng] Uniformization of the end of lines to Unix standard
- Format the EOL of all the files matched by: grep -rIUs . | xargs -Ifile dos2unix -k 'file'
Change-Id: I5c41d540a9a67b50de9b912ab35e16cc9a912961
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'plugins/uml/org.eclipse.papyrus.uml.import/src/org')
4 files changed, 182 insertions, 182 deletions
diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/Activator.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/Activator.java index 75671ea3345..95cf3cc132e 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/Activator.java +++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/Activator.java @@ -1,65 +1,65 @@ -/*****************************************************************************
- * Copyright (c) 2011 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.uml.importt;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.import"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2011 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.uml.importt; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.import"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + @Override + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/Messages.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/Messages.java index f0cc107ac04..9c14b06a4c6 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/Messages.java +++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/Messages.java @@ -1,17 +1,17 @@ -package org.eclipse.papyrus.uml.importt.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.importt.messages.messages"; //$NON-NLS-1$
-
- public static String ImportPackageFromFileHandler_SelectRegisteredModelLibrary;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
+package org.eclipse.papyrus.uml.importt.messages; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + + private static final String BUNDLE_NAME = "org.eclipse.papyrus.uml.importt.messages.messages"; //$NON-NLS-1$ + + public static String ImportPackageFromFileHandler_SelectRegisteredModelLibrary; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/messages.properties b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/messages.properties index 2a9d009dc55..6647ecc221d 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/messages.properties +++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/messages/messages.properties @@ -1 +1 @@ -ImportPackageFromFileHandler_SelectRegisteredModelLibrary=Select Registered ModelLibrary
+ImportPackageFromFileHandler_SelectRegisteredModelLibrary=Select Registered ModelLibrary diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/ui/PackageImportDialog.java b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/ui/PackageImportDialog.java index 4470ebd0b07..c584c6e477d 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/ui/PackageImportDialog.java +++ b/plugins/uml/org.eclipse.papyrus.uml.import/src/org/eclipse/papyrus/uml/importt/ui/PackageImportDialog.java @@ -1,99 +1,99 @@ -/*****************************************************************************
- * Copyright (c) 2012, 2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- * Christian W. Damus (CEA) - Refactoring package/profile import/apply UI for CDO
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.importt.ui;
-
-import java.util.Collection;
-
-import org.eclipse.papyrus.uml.profile.ui.dialogs.PackageImportTreeSelectionDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * An import package dialog, with the option to import a copy of the selected
- * package
- *
- * @author Camille Letavernier
- */
-public class PackageImportDialog extends PackageImportTreeSelectionDialog {
-
- public PackageImportDialog(Shell parent, Package model) {
- super(parent, model);
- }
-
- public PackageImportDialog(Shell parent, Collection<? extends Package> models) {
- super(parent, models);
- }
-
- @Override
- public Composite createDialogArea(Composite parent) {
- Composite result = (Composite) super.createDialogArea(parent);
-
- Composite buttons = new Composite(result, SWT.NONE);
- buttons.setLayout(new RowLayout());
-
- Button loadAll = new Button(buttons, SWT.PUSH);
- loadAll.setText("Load All");
- loadAll.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- selectAll(ImportAction.LOAD);
- }
- });
-
- Button importAll = new Button(buttons, SWT.PUSH);
- importAll.setText("Import All");
- importAll.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- selectAll(ImportAction.IMPORT);
- }
- });
-
- Button copyAll = new Button(buttons, SWT.PUSH);
- copyAll.setText("Copy All");
- copyAll.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- selectAll(ImportAction.COPY);
- }
- });
-
- Button deselectAll = new Button(buttons, SWT.PUSH);
- deselectAll.setText("Deselect All");
- deselectAll.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- selectAll(ImportAction.NONE);
- }
- });
-
- return result;
- }
-
- @Override
- protected boolean isResizable() {
- return true;
- }
-
-}
+/***************************************************************************** + * Copyright (c) 2012, 2013 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + * Christian W. Damus (CEA) - Refactoring package/profile import/apply UI for CDO + * + *****************************************************************************/ +package org.eclipse.papyrus.uml.importt.ui; + +import java.util.Collection; + +import org.eclipse.papyrus.uml.profile.ui.dialogs.PackageImportTreeSelectionDialog; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.RowLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.uml2.uml.Package; + +/** + * An import package dialog, with the option to import a copy of the selected + * package + * + * @author Camille Letavernier + */ +public class PackageImportDialog extends PackageImportTreeSelectionDialog { + + public PackageImportDialog(Shell parent, Package model) { + super(parent, model); + } + + public PackageImportDialog(Shell parent, Collection<? extends Package> models) { + super(parent, models); + } + + @Override + public Composite createDialogArea(Composite parent) { + Composite result = (Composite) super.createDialogArea(parent); + + Composite buttons = new Composite(result, SWT.NONE); + buttons.setLayout(new RowLayout()); + + Button loadAll = new Button(buttons, SWT.PUSH); + loadAll.setText("Load All"); + loadAll.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + selectAll(ImportAction.LOAD); + } + }); + + Button importAll = new Button(buttons, SWT.PUSH); + importAll.setText("Import All"); + importAll.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + selectAll(ImportAction.IMPORT); + } + }); + + Button copyAll = new Button(buttons, SWT.PUSH); + copyAll.setText("Copy All"); + copyAll.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + selectAll(ImportAction.COPY); + } + }); + + Button deselectAll = new Button(buttons, SWT.PUSH); + deselectAll.setText("Deselect All"); + deselectAll.addSelectionListener(new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + selectAll(ImportAction.NONE); + } + }); + + return result; + } + + @Override + protected boolean isResizable() { + return true; + } + +} |