Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options')
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EclipseLinkOptionsComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EventListenerComposite.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/IncludeDescriptorQueriesComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/PersistenceXmlOptionsTab.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionNameComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionsXmlComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetDatabaseComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetServerComposite.java16
8 files changed, 54 insertions, 54 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EclipseLinkOptionsComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EclipseLinkOptionsComposite.java
index 930b858ce9..ad375c914c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EclipseLinkOptionsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EclipseLinkOptionsComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -23,10 +23,10 @@ import org.eclipse.ui.forms.widgets.Section;
* EclipseLinkOptionsComposite
*/
public class EclipseLinkOptionsComposite
- extends AbstractFormPane<Options>
+ extends FormPane<Options>
{
public EclipseLinkOptionsComposite(
- AbstractFormPane<Options> subjectHolder,
+ FormPane<Options> subjectHolder,
Composite container) {
super(subjectHolder, container, false);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EventListenerComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EventListenerComposite.java
index 6e7dca94d0..3f9eb58ab2 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EventListenerComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EventListenerComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.ClassChooserPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* EventListenerComposite
*/
-public class EventListenerComposite extends AbstractPane<Options>
+public class EventListenerComposite extends Pane<Options>
{
/**
* Creates a new <code>EventListenerComposite</code>.
@@ -35,7 +35,7 @@ public class EventListenerComposite extends AbstractPane<Options>
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public EventListenerComposite(AbstractPane<? extends Options> parentPane,
+ public EventListenerComposite(Pane<? extends Options> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -66,18 +66,18 @@ public class EventListenerComposite extends AbstractPane<Options>
}
@Override
- protected String className() {
- return this.subject().getEventListener();
+ protected String getClassName() {
+ return this.getSubject().getEventListener();
}
@Override
- protected String labelText() {
+ protected String getLabelText() {
return EclipseLinkUiMessages.PersistenceXmlOptionsTab_eventListenerLabel;
}
@Override
- protected IPackageFragmentRoot packageFragmentRoot() {
- IProject project = this.subject().getJpaProject().getProject();
+ protected IPackageFragmentRoot getPackageFragmentRoot() {
+ IProject project = this.getSubject().getJpaProject().getProject();
IJavaProject root = JavaCore.create(project);
try {
@@ -95,7 +95,7 @@ public class EventListenerComposite extends AbstractPane<Options>
if (type != null) {
String className = type.getFullyQualifiedName('.');
- this.subject().setEventListener(className);
+ this.getSubject().setEventListener(className);
}
}
};
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/IncludeDescriptorQueriesComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/IncludeDescriptorQueriesComposite.java
index dc37254192..df681ce7bb 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/IncludeDescriptorQueriesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/IncludeDescriptorQueriesComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* IncludeDescriptorQueriesComposite
*/
-public class IncludeDescriptorQueriesComposite extends AbstractFormPane<Options>
+public class IncludeDescriptorQueriesComposite extends FormPane<Options>
{
/**
* Creates a new <code>IncludeDescriptorQueriesComposite</code>.
@@ -33,7 +33,7 @@ public class IncludeDescriptorQueriesComposite extends AbstractFormPane<Options>
* The parent container
*/
public IncludeDescriptorQueriesComposite(
- AbstractFormPane<? extends Options> parentComposite,
+ FormPane<? extends Options> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class IncludeDescriptorQueriesComposite extends AbstractFormPane<Options>
return new TransformationPropertyValueModel<Boolean, String>(buildIncludeDescriptorQueriesHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultIncludeDescriptorQueries();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultIncludeDescriptorQueries();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlOptionsTab_includeDescriptorQueriesLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class IncludeDescriptorQueriesComposite extends AbstractFormPane<Options>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlOptionsTab_includeDescriptorQueriesLabel,
this.buildIncludeDescriptorQueriesHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/PersistenceXmlOptionsTab.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/PersistenceXmlOptionsTab.java
index 1ba4b2f8af..64fe404061 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/PersistenceXmlOptionsTab.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/PersistenceXmlOptionsTab.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
* PersistenceXmlOptionsTab
*/
public class PersistenceXmlOptionsTab
- extends AbstractFormPane<Options>
+ extends FormPane<Options>
implements JpaPageComposite
{
// ********** constructors/initialization **********
@@ -57,7 +57,7 @@ public class PersistenceXmlOptionsTab
// ********** Layout **********
@Override
- protected Composite buildContainer(Composite parent) {
+ protected Composite addContainer(Composite parent) {
GridLayout layout = new GridLayout(1, true);
layout.marginHeight = 0;
layout.marginWidth = 0;
@@ -66,7 +66,7 @@ public class PersistenceXmlOptionsTab
layout.marginBottom = 0;
layout.marginRight = 0;
layout.verticalSpacing = 15;
- Composite container = this.buildPane(parent, layout);
+ Composite container = this.addPane(parent, layout);
this.updateGridData(container);
return container;
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionNameComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionNameComposite.java
index 81148be0ce..0370c05e9f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionNameComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionNameComposite.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.PropertyListValueModelAdapter;
import org.eclipse.jpt.utility.model.value.ListValueModel;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* SessionNameComposite
*/
-public class SessionNameComposite extends AbstractPane<Options>
+public class SessionNameComposite extends Pane<Options>
{
/**
* Creates a new <code>SessionNameComposite</code>.
@@ -34,7 +34,7 @@ public class SessionNameComposite extends AbstractPane<Options>
* @param parent The parent container
*/
public SessionNameComposite(
- AbstractPane<? extends Options> parentPane,
+ Pane<? extends Options> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -44,7 +44,7 @@ public class SessionNameComposite extends AbstractPane<Options>
return new PropertyAspectAdapter<Options, String>(this.getSubjectHolder(), Options.DEFAULT_SESSION_NAME) {
@Override
protected String buildValue_() {
- return SessionNameComposite.this.defaultValue(subject);
+ return SessionNameComposite.this.getDefaultValue(subject);
}
};
}
@@ -62,7 +62,7 @@ public class SessionNameComposite extends AbstractPane<Options>
String name = subject.getSessionName();
if (name == null) {
- name = SessionNameComposite.this.defaultValue(subject);
+ name = SessionNameComposite.this.getDefaultValue(subject);
}
return name;
}
@@ -70,7 +70,7 @@ public class SessionNameComposite extends AbstractPane<Options>
@Override
protected void setValue_(String value) {
- if (defaultValue(subject).equals(value)) {
+ if (getDefaultValue(subject).equals(value)) {
value = null;
}
subject.setSessionName(value);
@@ -78,7 +78,7 @@ public class SessionNameComposite extends AbstractPane<Options>
};
}
- private String defaultValue(Options subject) {
+ private String getDefaultValue(Options subject) {
String defaultValue = subject.getDefaultSessionName();
if (defaultValue != null) {
@@ -98,7 +98,7 @@ public class SessionNameComposite extends AbstractPane<Options>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
EclipseLinkUiMessages.PersistenceXmlOptionsTab_sessionName,
this.buildDefaultSessionNameListHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionsXmlComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionsXmlComposite.java
index e6596c6e6b..34d60b6320 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionsXmlComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionsXmlComposite.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.PropertyListValueModelAdapter;
import org.eclipse.jpt.utility.model.value.ListValueModel;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* SessionsXmlComposite
*/
-public class SessionsXmlComposite extends AbstractPane<Options>
+public class SessionsXmlComposite extends Pane<Options>
{
/**
* Creates a new <code>SessionsXmlComposite</code>.
@@ -34,7 +34,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
* @param parent The parent container
*/
public SessionsXmlComposite(
- AbstractPane<? extends Options> parentPane,
+ Pane<? extends Options> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -44,7 +44,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
return new PropertyAspectAdapter<Options, String>(this.getSubjectHolder(), Options.DEFAULT_SESSIONS_XML) {
@Override
protected String buildValue_() {
- return SessionsXmlComposite.this.defaultValue(subject);
+ return SessionsXmlComposite.this.getDefaultValue(subject);
}
};
}
@@ -62,7 +62,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
String name = subject.getSessionsXml();
if (name == null) {
- name = SessionsXmlComposite.this.defaultValue(subject);
+ name = SessionsXmlComposite.this.getDefaultValue(subject);
}
return name;
}
@@ -70,7 +70,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
@Override
protected void setValue_(String value) {
- if (defaultValue(subject).equals(value)) {
+ if (getDefaultValue(subject).equals(value)) {
value = null;
}
subject.setSessionsXml(value);
@@ -78,7 +78,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
};
}
- private String defaultValue(Options subject) {
+ private String getDefaultValue(Options subject) {
String defaultValue = subject.getDefaultSessionsXml();
if (defaultValue != null) {
@@ -98,7 +98,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
EclipseLinkUiMessages.PersistenceXmlOptionsTab_sessionsXml,
this.buildDefaultSessionsXmlFileNameListHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetDatabaseComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetDatabaseComposite.java
index 3a0bd59e11..7b46597b2f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetDatabaseComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetDatabaseComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.TargetDatabase;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.StringConverter;
import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
@@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* TargetDatabaseComposite
*/
-public class TargetDatabaseComposite extends AbstractPane<Options>
+public class TargetDatabaseComposite extends Pane<Options>
{
/**
* Creates a new <code>TargetDatabaseComposite</code>.
@@ -47,7 +47,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
* @param parent The parent container
*/
public TargetDatabaseComposite(
- AbstractPane<? extends Options> parentPane,
+ Pane<? extends Options> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -57,7 +57,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
return new PropertyAspectAdapter<Options, String>(this.getSubjectHolder(), Options.DEFAULT_TARGET_DATABASE) {
@Override
protected String buildValue_() {
- return TargetDatabaseComposite.this.defaultValue(subject);
+ return TargetDatabaseComposite.this.getDefaultValue(subject);
}
};
}
@@ -108,7 +108,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
String name = subject.getTargetDatabase();
if (name == null) {
- name = TargetDatabaseComposite.this.defaultValue(subject);
+ name = TargetDatabaseComposite.this.getDefaultValue(subject);
}
return name;
}
@@ -116,7 +116,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
@Override
protected void setValue_(String value) {
- if (defaultValue(subject).equals(value)) {
+ if (getDefaultValue(subject).equals(value)) {
value = null;
}
subject.setTargetDatabase(value);
@@ -153,7 +153,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
);
}
- private String defaultValue(Options subject) {
+ private String getDefaultValue(Options subject) {
String defaultValue = subject.getDefaultTargetDatabase();
if (defaultValue != null) {
@@ -173,7 +173,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
EclipseLinkUiMessages.PersistenceXmlOptionsTab_targetDatabaseLabel,
this.buildTargetDatabaseListHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetServerComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetServerComposite.java
index 54d8cf3823..f6ad577e4f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetServerComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetServerComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.TargetServer;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.StringConverter;
import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
@@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* TargetServerComposite
*/
-public class TargetServerComposite extends AbstractPane<Options>
+public class TargetServerComposite extends Pane<Options>
{
/**
* Creates a new <code>TargetServerComposite</code>.
@@ -47,7 +47,7 @@ public class TargetServerComposite extends AbstractPane<Options>
* @param parent The parent container
*/
public TargetServerComposite(
- AbstractPane<? extends Options> parentPane,
+ Pane<? extends Options> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -57,7 +57,7 @@ public class TargetServerComposite extends AbstractPane<Options>
return new PropertyAspectAdapter<Options, String>(this.getSubjectHolder(), Options.DEFAULT_TARGET_SERVER) {
@Override
protected String buildValue_() {
- return TargetServerComposite.this.defaultValue(subject);
+ return TargetServerComposite.this.getDefaultValue(subject);
}
};
}
@@ -108,7 +108,7 @@ public class TargetServerComposite extends AbstractPane<Options>
String name = subject.getTargetServer();
if (name == null) {
- name = TargetServerComposite.this.defaultValue(subject);
+ name = TargetServerComposite.this.getDefaultValue(subject);
}
return name;
}
@@ -116,7 +116,7 @@ public class TargetServerComposite extends AbstractPane<Options>
@Override
protected void setValue_(String value) {
- if (defaultValue(subject).equals(value)) {
+ if (getDefaultValue(subject).equals(value)) {
value = null;
}
subject.setTargetServer(value);
@@ -153,7 +153,7 @@ public class TargetServerComposite extends AbstractPane<Options>
);
}
- private String defaultValue(Options subject) {
+ private String getDefaultValue(Options subject) {
String defaultValue = subject.getDefaultTargetServer();
if (defaultValue != null) {
@@ -173,7 +173,7 @@ public class TargetServerComposite extends AbstractPane<Options>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
EclipseLinkUiMessages.PersistenceXmlOptionsTab_targetServerLabel,
this.buildTargetServerListHolder(),

Back to the top