From ba0938b2d0d0f072870b7e7c14ad8f6b6074f63f Mon Sep 17 00:00:00 2001 From: "nikolas.laskaris" Date: Tue, 28 Jan 2014 12:21:08 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerCore@90628 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 5 +++-- .project | 13 +++++++++++++ .settings/org.eclipse.jdt.core.prefs | 9 ++++++--- .settings/org.eclipse.wst.common.component | 6 ++++++ .../org.eclipse.wst.common.project.facet.core.xml | 5 +++++ .../framework/core/util/GenericResource.java | 15 +++++++++++++++ 6 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 .settings/org.eclipse.wst.common.component create mode 100644 .settings/org.eclipse.wst.common.project.facet.core.xml diff --git a/.classpath b/.classpath index edc9698..135f740 100644 --- a/.classpath +++ b/.classpath @@ -17,12 +17,13 @@ - + + - + diff --git a/.project b/.project index 4d9e884..bba1a6a 100644 --- a/.project +++ b/.project @@ -5,6 +5,11 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder @@ -15,9 +20,17 @@ + + org.eclipse.wst.validation.validationbuilder + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 60105c1..45a6e0e 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component new file mode 100644 index 0000000..2986a4b --- /dev/null +++ b/.settings/org.eclipse.wst.common.component @@ -0,0 +1,6 @@ + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 0000000..a1f6907 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/java/org/gcube/application/framework/core/util/GenericResource.java b/src/main/java/org/gcube/application/framework/core/util/GenericResource.java index 59da441..fe0218b 100644 --- a/src/main/java/org/gcube/application/framework/core/util/GenericResource.java +++ b/src/main/java/org/gcube/application/framework/core/util/GenericResource.java @@ -343,6 +343,21 @@ public class GenericResource implements GenericResourceInfoI { // } // } + /** + * @return a list containing pairs of (name, id) of the available generic resources + * @throws RemoteException when an error has occurred while communicating with IS + */ + public List getAllGenericResources() throws RemoteException { + SimpleQuery queryMan = null; + try { + queryMan = queryFor(org.gcube.common.resources.gcore.GenericResource.class); + return client.submit(queryMan); + } catch (Exception e) { + logger.error("Exception:", e); + throw new RemoteException(); + } + } + /** * Updates a generic resource based on its ID * @param genericResource the generic resource to be updated