Bug 493074 - Compilation error using IDialogConstants and with RAP UI
Replace constants in ElementListSelectionDialog with Strings.
Also remove a couple of warnings in the package.
Change-Id: I039dfe97a24ba24959839144101a26c527eae848
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateAliasDialog.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateAliasDialog.java
index a3ee53a..2a4448e 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateAliasDialog.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateAliasDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008-2011 Chair for Applied Software Engineering,
+ * Copyright (c) 2008-2016 Chair for Applied Software Engineering,
* Technische Universitaet Muenchen.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * pfeifferc
+ * Carl Pfeiffer - initial API and implementation
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.ui.views.emfstorebrowser.views;
@@ -31,6 +31,11 @@
public class CertificateAliasDialog extends Dialog {
/**
+ * Serial version UID for RAP.
+ */
+ public static final long serialVersionUID = 1L;
+
+ /**
* The message to display, or <code>null</code> if none.
*/
private final String message;
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateSelectionDialog.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateSelectionDialog.java
index 529dad9..663fd1e 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateSelectionDialog.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateSelectionDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008-2011 Chair for Applied Software Engineering,
+ * Copyright (c) 2008-2016 Chair for Applied Software Engineering,
* Technische Universitaet Muenchen.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -47,6 +47,11 @@
*/
public class CertificateSelectionDialog extends ElementListSelectionDialog {
+ /**
+ * Serial version UID for RAP.
+ */
+ public static final long serialVersionUID = 1L;
+
private TableItem selectedTableItem;
private String alias = StringUtils.EMPTY;
@@ -127,26 +132,7 @@
// Delete certificate
final Button delete = new Button(certButtonsComposite, SWT.NONE);
delete.setText(Messages.CertificateSelectionDialog_Delete);
- delete.addSelectionListener(new SelectionListener() {
-
- private static final long serialVersionUID = 1L;
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // nothing to do
- }
-
- public void widgetSelected(SelectionEvent e) {
- if (selectedTableItem != null && StringUtils.isNotBlank(selectedTableItem.getText())) {
- final String alias = selectedTableItem.getText();
- try {
- KeyStoreManager.getInstance().deleteCertificate(alias);
- setListElements(KeyStoreManager.getInstance().getCertificates().toArray());
- } catch (final ESCertificateException e1) {
- setErrorMessage(e1.getMessage());
- }
- }
- }
- });
+ delete.addSelectionListener(new DeleteButtonSelectionListener());
getFilteredList().addSelectionListener(new SelectionListenerImplementation(certDetails, certAlias));
return control;
}
@@ -178,8 +164,11 @@
* @author koegel
*
*/
- private final class SelectionListenerImplementation implements SelectionListener {
- private static final long serialVersionUID = 1L;
+ final class SelectionListenerImplementation implements SelectionListener {
+ /**
+ * Serial version UID for RAP.
+ */
+ public static final long serialVersionUID = 1L;
private final Text certDetails;
private final Text certAlias;
@@ -188,10 +177,22 @@
this.certAlias = certAlias;
}
+ /**
+ *
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
+ */
public void widgetDefaultSelected(SelectionEvent e) {
// nothing to do
}
+ /**
+ *
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+ */
public void widgetSelected(SelectionEvent e) {
if (((Table) e.getSource()).getItems().length > 0) {
selectedTableItem = ((Table) e.getSource()).getItems()[((Table) e.getSource()).getSelectionIndex()];
@@ -219,7 +220,10 @@
* @author pfeifferc
*/
class CertificateSelectionListener implements SelectionListener {
- private static final long serialVersionUID = 1L;
+ /**
+ * Serial version UID for RAP.
+ */
+ public static final long serialVersionUID = 1L;
/**
* Add a certificate specified by the user.
@@ -272,4 +276,44 @@
// nothing to do
}
}
+
+ /**
+ * Selection listener for the delete button.
+ *
+ */
+ final class DeleteButtonSelectionListener implements SelectionListener {
+
+ /**
+ * Serial version UID for RAP.
+ */
+ public static final long serialVersionUID = 1L;
+
+ /**
+ *
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
+ */
+ public void widgetDefaultSelected(SelectionEvent e) {
+ // nothing to do
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+ */
+ public void widgetSelected(SelectionEvent e) {
+ if (selectedTableItem != null && StringUtils.isNotBlank(selectedTableItem.getText())) {
+ final String alias = selectedTableItem.getText();
+ try {
+ KeyStoreManager.getInstance().deleteCertificate(alias);
+ setListElements(KeyStoreManager.getInstance().getCertificates().toArray());
+ } catch (final ESCertificateException e1) {
+ setErrorMessage(e1.getMessage());
+ }
+ }
+ }
+ }
}
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CreateProjectDialog.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CreateProjectDialog.java
index 8e41b68..c754a3e 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CreateProjectDialog.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CreateProjectDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008-2011 Chair for Applied Software Engineering,
+ * Copyright (c) 2008-2016 Chair for Applied Software Engineering,
* Technische Universitaet Muenchen.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -33,6 +33,11 @@
// TODO: remove description
public class CreateProjectDialog extends TitleAreaDialog {
+ /**
+ * Serial version UID for RAP.
+ */
+ public static final long serialVersionUID = 1L;
+
private Text txtProjectName;
private String name;
private String labelText;
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/ElementListSelectionDialog.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/ElementListSelectionDialog.java
index 16f369b..a48ca12 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/ElementListSelectionDialog.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/ElementListSelectionDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008-2011 Chair for Applied Software Engineering,
+ * Copyright (c) 2008-2016 Chair for Applied Software Engineering,
* Technische Universitaet Muenchen.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -7,6 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
+ * Edgar Mueller - Fix for Bug 493074
******************************************************************************/
/*******************************************************************************
*
@@ -61,11 +62,10 @@
*/
public abstract class ElementListSelectionDialog extends TrayDialog {
- // private static final String SELECT_ALL_TITLE =
- // Messages.ElementListSelectionDialog_SelectAll;
-
- // private static final String DESELECT_ALL_TITLE =
- // Messages.ElementListSelectionDialog_DeselectAll;
+ /**
+ * Serial version UID for RAP.
+ */
+ public static final long serialVersionUID = 1L;
private FilteredList fFilteredList;
@@ -163,10 +163,14 @@
*/
@Override
protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
+ createButton(parent,
+ IDialogConstants.OK_ID,
+ "Ok", //$NON-NLS-1$
true);
- createButton(parent, IDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL, false);
+ createButton(parent,
+ IDialogConstants.CANCEL_ID,
+ "Cancel", //$NON-NLS-1$
+ false);
}
/*
@@ -751,7 +755,6 @@
* @param parent the parent composite.
* @return returns the filtered list widget.
*/
- @SuppressWarnings("serial")
protected FilteredList createFilteredList(Composite parent) {
final int flags = SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL
| (fIsMultipleSelection ? SWT.MULTI : SWT.SINGLE);
@@ -816,7 +819,6 @@
text.setText(fFilter == null ? "" : fFilter); //$NON-NLS-1$
- @SuppressWarnings("serial")
final Listener listener = new Listener() {
public void handleEvent(Event e) {
fFilteredList.setFilter(fFilterText.getText());
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/MessageLine.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/MessageLine.java
index b0725cf..190b30e 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/MessageLine.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/MessageLine.java
@@ -36,7 +36,10 @@
*/
public class MessageLine extends CLabel {
- private static final long serialVersionUID = 1L;
+ /**
+ * Serial version UID for RAP.
+ */
+ public static final long serialVersionUID = 1L;
private final Color fNormalMsgAreaBackground;
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/NewRepositoryWizardPageOne.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/NewRepositoryWizardPageOne.java
index 026f4a7..eb344f8 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/NewRepositoryWizardPageOne.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/NewRepositoryWizardPageOne.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008-2011 Chair for Applied Software Engineering,
+ * Copyright (c) 2008-2016 Chair for Applied Software Engineering,
* Technische Universitaet Muenchen.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -41,6 +41,10 @@
*/
public class NewRepositoryWizardPageOne extends WizardPage {
+ /**
+ * Serial version UID for RAP.
+ */
+ public static final long serialVersionUID = 1L;
private static final int DEFAULT_PORT = 8080;
private Text name;
private Text url;
@@ -207,7 +211,10 @@
*/
class SelectionDialogListener implements SelectionListener {
- private static final long serialVersionUID = 1L;
+ /**
+ * Serial version UID for RAP.
+ */
+ public static final long serialVersionUID = 1L;
/**
* @param e
@@ -226,15 +233,7 @@
public void widgetSelected(SelectionEvent e) {
final CertificateSelectionDialog csd = new CertificateSelectionDialog(
Display.getCurrent().getActiveShell(),
- new LabelProvider() {
- @Override
- public String getText(Object element) {
- if (element instanceof String) {
- return element.toString();
- }
- return StringUtils.EMPTY;
- }
- });
+ new CertificateSelectionDialogLabelProvider());
ArrayList<String> certificates;
try {
certificates = KeyStoreManager.getInstance().getCertificates();
@@ -257,4 +256,24 @@
}
}
}
+
+ /**
+ * {@link LabelProvider} for the certificate selection dialog.
+ *
+ */
+ final class CertificateSelectionDialogLabelProvider extends LabelProvider {
+
+ /**
+ * Serial version UID for RAP.
+ */
+ public static final long serialVersionUID = 1L;
+
+ @Override
+ public String getText(Object element) {
+ if (element instanceof String) {
+ return element.toString();
+ }
+ return StringUtils.EMPTY;
+ }
+ }
}
