You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2016/03/02 17:34:34 UTC
svn commit: r1733329 - in /sling/trunk/tooling/ide/eclipse-ui: plugin.xml
src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java
Author: rombert
Date: Wed Mar 2 16:34:34 2016
New Revision: 1733329
URL: http://svn.apache.org/viewvc?rev=1733329&view=rev
Log:
SLING-3605 - Debug based on bundles deployed on the server
Move the 'connection' section to the left side of the editor, otherwise
the editor is too imbalanced.
Modified:
sling/trunk/tooling/ide/eclipse-ui/plugin.xml
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java
Modified: sling/trunk/tooling/ide/eclipse-ui/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/plugin.xml?rev=1733329&r1=1733328&r2=1733329&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/plugin.xml Wed Mar 2 16:34:34 2016
@@ -57,12 +57,10 @@
<section
id="org.apache.sling.ide.launchpadConfigurationEditorSection"
order="10"
- insertionId="org.eclipse.wst.server.editor.overview.right"
+ insertionId="org.eclipse.wst.server.editor.overview.left"
typeIds="org.apache.sling.ide.launchpadServer"
class="org.apache.sling.ide.eclipse.ui.internal.ConnectionEditorSection">
</section>
- </extension>
- <extension point="org.eclipse.wst.server.ui.editorPageSections">
<section
id="org.apache.sling.ide.launchpadConfigurationEditorSection"
order="10"
Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java?rev=1733329&r1=1733328&r2=1733329&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ConnectionEditorSection.java Wed Mar 2 16:34:34 2016
@@ -61,7 +61,7 @@ public class ConnectionEditorSection ext
super.createSection(parent);
FormToolkit toolkit = getFormToolkit(parent.getDisplay());
- Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED
+ Section section = toolkit.createSection(parent, ExpandableComposite.EXPANDED
| ExpandableComposite.TITLE_BAR | Section.DESCRIPTION | ExpandableComposite.FOCUS_TITLE);
section.setText("Connection");
section.setDescription("Connection details for this server");
@@ -70,23 +70,26 @@ public class ConnectionEditorSection ext
// ports
Composite composite = toolkit.createComposite(section);
+ // layout similar to ServerPropertiesEditorSection
GridLayout layout = new GridLayout();
layout.numColumns = 2;
- layout.marginHeight = 8;
- layout.marginWidth = 8;
+ layout.marginHeight = 5;
+ layout.marginWidth = 10;
+ layout.verticalSpacing = 5;
+ layout.horizontalSpacing = 15;
+
composite.setLayout(layout);
- GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.FILL_HORIZONTAL);
- composite.setLayoutData(gridData);
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false));
toolkit.paintBordersFor(composite);
section.setClient(composite);
- createLabel(toolkit, composite, "Port");
+ createLabel(toolkit, composite, "Port:");
portText = createText(toolkit, composite, SWT.SINGLE);
- createLabel(toolkit, composite, "Debug Port");
+ createLabel(toolkit, composite, "Debug Port:");
debugPortText = createText(toolkit, composite, SWT.SINGLE);
- createLabel(toolkit, composite, "Context path");
+ createLabel(toolkit, composite, "Context path:");
contextPathText = createText(toolkit, composite, SWT.SINGLE);
// TODO wrong parent
@@ -95,10 +98,10 @@ public class ConnectionEditorSection ext
data.horizontalSpan = 2;
separator.setLayoutData(data);
- createLabel(toolkit, composite, "Username");
+ createLabel(toolkit, composite, "Username:");
usernameText = createText(toolkit, composite, SWT.SINGLE);
- createLabel(toolkit, composite, "Password");
+ createLabel(toolkit, composite, "Password:");
passwordText = createText(toolkit, composite, SWT.PASSWORD);
initialize();
@@ -107,10 +110,10 @@ public class ConnectionEditorSection ext
private void createLabel(FormToolkit toolkit, Composite composite, String label) {
Label portLabel = toolkit.createLabel(composite, label);
portLabel.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalIndent = 20;
- data.widthHint = 20;
- portLabel.setLayoutData(data);
+// GridData data = new GridData(GridData.FILL_HORIZONTAL);
+// data.horizontalIndent = 4;
+// data.widthHint = 20;
+// portLabel.setLayoutData(data);
}
private Text createText(FormToolkit toolkit, Composite composite, int flags) {