From: Mathieu Baudier Date: Tue, 17 Apr 2018 09:55:05 +0000 (+0200) Subject: Introduce standard Eclipse 4 fragments X-Git-Tag: argeo-suite-2.1.13~52 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=6ba0f8543d64d3c4c937d6ec0dc70e1bedf54895 Introduce standard Eclipse 4 fragments --- diff --git a/org.argeo.suite.e4/build.properties b/org.argeo.suite.e4/build.properties index 8795cd4..a811880 100644 --- a/org.argeo.suite.e4/build.properties +++ b/org.argeo.suite.e4/build.properties @@ -3,5 +3,6 @@ bin.includes = META-INF/,\ .,\ OSGI-INF/,\ e4xmi/,\ - plugin.xml + plugin.xml,\ + e4xmi/argeo-suite-toolbars.e4xmi source.. = src/ diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi index 83cc4d3..f3af3c2 100644 --- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi +++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi @@ -8,22 +8,21 @@ minimized - - + + entityEditorArea - + - + - @@ -34,39 +33,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -94,7 +63,7 @@ - + diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java index 3f95d8c..d29db28 100644 --- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java +++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/QuickSearchView.java @@ -33,6 +33,7 @@ import org.argeo.connect.util.XPathUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; import org.argeo.people.PeopleService; +import org.eclipse.e4.ui.di.Focus; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ILabelProvider; @@ -183,7 +184,7 @@ public class QuickSearchView implements Refreshable { JcrUtils.logoutQuietly(session); } - + @Focus public void setFocus() { refreshFilteredList(); filterTxt.setFocus(); diff --git a/org.argeo.suite.standard/.classpath b/org.argeo.suite.standard/.classpath new file mode 100644 index 0000000..eca7bdb --- /dev/null +++ b/org.argeo.suite.standard/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.argeo.suite.standard/.gitignore b/org.argeo.suite.standard/.gitignore new file mode 100644 index 0000000..e0e1cc4 --- /dev/null +++ b/org.argeo.suite.standard/.gitignore @@ -0,0 +1,2 @@ +/bin/ +/target diff --git a/org.argeo.suite.standard/.project b/org.argeo.suite.standard/.project new file mode 100644 index 0000000..22ed203 --- /dev/null +++ b/org.argeo.suite.standard/.project @@ -0,0 +1,28 @@ + + + org.argeo.suite.standard + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.argeo.suite.standard/META-INF/.gitignore b/org.argeo.suite.standard/META-INF/.gitignore new file mode 100644 index 0000000..4854a41 --- /dev/null +++ b/org.argeo.suite.standard/META-INF/.gitignore @@ -0,0 +1 @@ +/MANIFEST.MF diff --git a/org.argeo.suite.standard/bnd.bnd b/org.argeo.suite.standard/bnd.bnd new file mode 100644 index 0000000..e2dbcd2 --- /dev/null +++ b/org.argeo.suite.standard/bnd.bnd @@ -0,0 +1,2 @@ +Bundle-SymbolicName: org.argeo.suite.standard;singleton:=true +Bundle-ActivationPolicy: lazy diff --git a/org.argeo.suite.standard/build.properties b/org.argeo.suite.standard/build.properties new file mode 100644 index 0000000..34d2e4d --- /dev/null +++ b/org.argeo.suite.standard/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/org.argeo.suite.standard/e4xmi/standard-toolbars.e4xmi b/org.argeo.suite.standard/e4xmi/standard-toolbars.e4xmi new file mode 100644 index 0000000..ef70419 --- /dev/null +++ b/org.argeo.suite.standard/e4xmi/standard-toolbars.e4xmi @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.argeo.suite.standard/plugin.xml b/org.argeo.suite.standard/plugin.xml new file mode 100644 index 0000000..c4d9794 --- /dev/null +++ b/org.argeo.suite.standard/plugin.xml @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/org.argeo.suite.standard/pom.xml b/org.argeo.suite.standard/pom.xml new file mode 100644 index 0000000..1b7bb09 --- /dev/null +++ b/org.argeo.suite.standard/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + org.argeo.suite + argeo-suite + 0.1.13-SNAPSHOT + .. + + org.argeo.suite.standard + Standard Suite + jar + + + org.argeo.suite + org.argeo.suite.e4 + 0.1.13-SNAPSHOT + + + diff --git a/pom.xml b/pom.xml index 46dc56e..079be9a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ org.argeo.suite.cms org.argeo.suite.e4 org.argeo.suite.e4.rap + org.argeo.suite.standard org.argeo.suite.apps