From: Mathieu Baudier Date: Sat, 17 Oct 2015 17:02:50 +0000 (+0000) Subject: Remove warnings. X-Git-Tag: argeo-commons-2.1.30~71 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=43f4cfb5bf7a475a6b92831f3077a3c7d6aed82e;p=lgpl%2Fargeo-commons.git Remove warnings. git-svn-id: https://svn.argeo.org/commons/trunk@8508 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd index 6525a72bf..8a63ee2a1 100644 --- a/org.argeo.cms/bnd.bnd +++ b/org.argeo.cms/bnd.bnd @@ -1,4 +1,4 @@ -Bundle-SymbolicName: org.argeo.cms;singleton=true +Bundle-SymbolicName: org.argeo.cms;singleton:=true Bundle-Activator: org.argeo.cms.internal.kernel.Activator Import-Package: javax.jcr.security,\ org.xml.sax,\ diff --git a/org.argeo.cms/build.properties b/org.argeo.cms/build.properties index cee30655b..0e17db067 100644 --- a/org.argeo.cms/build.properties +++ b/org.argeo.cms/build.properties @@ -1,5 +1,6 @@ source.. = src/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + OSGI-INF/ additional.bundles = org.apache.jackrabbit.data diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/UserUi.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/UserUi.java index 936882a0f..fd332eee1 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/UserUi.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/UserUi.java @@ -2,25 +2,13 @@ package org.argeo.cms.internal.kernel; import org.argeo.cms.util.LoginEntryPoint; import org.eclipse.rap.rwt.application.Application; -import org.eclipse.rap.rwt.application.ApplicationConfiguration; -import org.eclipse.rap.rwt.application.EntryPoint; -import org.eclipse.rap.rwt.application.EntryPointFactory; import org.eclipse.rap.rwt.application.Application.OperationMode; +import org.eclipse.rap.rwt.application.ApplicationConfiguration; public class UserUi implements ApplicationConfiguration { - @Override public void configure(Application application) { application.setOperationMode(OperationMode.SWT_COMPATIBILITY); application.addEntryPoint("/login", LoginEntryPoint.class, null); } - - private class LoginEpf implements EntryPointFactory { - - @Override - public EntryPoint create() { - return new LoginEntryPoint(); - } - - } } diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java index 703f3f6de..96f03bb8a 100644 --- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java +++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java @@ -330,9 +330,9 @@ public abstract class LdifUsersTable extends Composite { table.setHeaderVisible(true); TableViewerColumn column; - int offset = 0; +// int offset = 0; if (hasSelectionColumn) { - offset = 1; + // offset = 1; column = ViewerUtils.createTableViewerColumn(viewer, "", SWT.NONE, 25); column.setLabelProvider(new ColumnLabelProvider() { @@ -360,7 +360,7 @@ public abstract class LdifUsersTable extends Composite { // NodeViewerComparator comparator = new NodeViewerComparator(); // TODO enable the sort by click on the header - int i = offset; +// int i = offset; for (ColumnDefinition colDef : columnDefs) createTableColumn(viewer, layout, colDef);