From 2e73e0037ec05e883d23e776495ffbe01c3db465 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Mon, 24 Jan 2011 18:43:59 +0000
Subject: [PATCH] Further implementation of the UI.

git-svn-id: https://svn.argeo.org/commons/trunk@4075 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.eclipse.dep.rap/pom.xml         | 17 +++----------
 .../jcr/editors/AbstractJcrQueryEditor.java   | 25 ++++++++++++++++---
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
index 86b1ae7dd..24b5e5321 100644
--- a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
@@ -46,18 +46,10 @@
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>org.eclipse.equinox.http.servlet</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.rap</groupId>
-			<artifactId>org.eclipse.rap.demo.databinding</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.rap</groupId>
-			<artifactId>org.eclipse.rap.demo</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.rap</groupId>
-			<artifactId>org.eclipse.rap.design.example</artifactId>
-		</dependency>
+		<!-- <dependency> <groupId>org.eclipse.rap</groupId> <artifactId>org.eclipse.rap.demo.databinding</artifactId> 
+			</dependency> <dependency> <groupId>org.eclipse.rap</groupId> <artifactId>org.eclipse.rap.demo</artifactId> 
+			</dependency> <dependency> <groupId>org.eclipse.rap</groupId> <artifactId>org.eclipse.rap.design.example</artifactId> 
+			</dependency> -->
 		<dependency>
 			<groupId>org.eclipse.rap</groupId>
 			<artifactId>org.eclipse.rap.jface.databinding</artifactId>
@@ -94,6 +86,5 @@
 			<groupId>org.eclipse.core</groupId>
 			<artifactId>org.eclipse.core.databinding.beans</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>
diff --git a/eclipse/plugins/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java b/eclipse/plugins/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java
index 802fc0f12..c8bb4ff80 100644
--- a/eclipse/plugins/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java
+++ b/eclipse/plugins/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java
@@ -70,7 +70,7 @@ public abstract class AbstractJcrQueryEditor extends EditorPart {
 
 		Composite bottom = new Composite(sashForm, SWT.NONE);
 		bottom.setLayout(new GridLayout(1, false));
-		sashForm.setWeights(new int[] { 30, 70 });
+		sashForm.setWeights(getWeights());
 
 		viewer = new TableViewer(bottom);
 		viewer.getTable().setLayoutData(
@@ -79,6 +79,18 @@ public abstract class AbstractJcrQueryEditor extends EditorPart {
 		viewer.setContentProvider(new QueryResultContentProvider());
 		// viewer.setLabelProvider(new QueryResultLabelProvider());
 		viewer.setInput(getEditorSite());
+
+		// viewer.addDoubleClickListener(new QueryResultDoubleClickListener());
+
+	}
+
+	/**
+	 * To be overidden to adapt size of form and result frames.
+	 * 
+	 * @return
+	 */
+	protected int[] getWeights() {
+		return new int[] { 30, 70 };
 	}
 
 	protected void executeQuery(String statement) {
@@ -92,8 +104,7 @@ public abstract class AbstractJcrQueryEditor extends EditorPart {
 
 			for (final String columnName : qr.getColumnNames()) {
 				TableViewerColumn tvc = new TableViewerColumn(viewer, SWT.NONE);
-				tvc.getColumn().setWidth(50);
-				tvc.getColumn().setText(columnName);
+				configureColumn(columnName, tvc);
 				tvc.setLabelProvider(new ColumnLabelProvider() {
 
 					public String getText(Object element) {
@@ -123,6 +134,13 @@ public abstract class AbstractJcrQueryEditor extends EditorPart {
 		}
 	}
 
+	/** To be overridden in order to configure the columns. */
+	protected void configureColumn(String jcrColumnName,
+			TableViewerColumn column) {
+		column.getColumn().setWidth(50);
+		column.getColumn().setText(jcrColumnName);
+	}
+
 	private class QueryResultContentProvider implements
 			IStructuredContentProvider {
 
@@ -194,6 +212,7 @@ public abstract class AbstractJcrQueryEditor extends EditorPart {
 		return false;
 	}
 
+	// IoC
 	public void setSession(Session session) {
 		this.session = session;
 	}
-- 
2.30.2