Author: marrs
Date: Mon Oct 6 15:46:16 2014
New Revision: 1629684
URL: http://svn.apache.org/r1629684
Log:
ACE-484 Implemented the commands.
Modified:
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/Workspace.java
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java
Modified:
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/Workspace.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/Workspace.java?rev=1629684&r1=1629683&r2=1629684&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/Workspace.java
(original)
+++
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/Workspace.java
Mon Oct 6 15:46:16 2014
@@ -272,6 +272,8 @@ public interface Workspace {
public void da(RepositoryObject repositoryObject);
+ public void da(String filter) throws Exception;
+
/*** artifact to feature association ***/
public List<Artifact2FeatureAssociation> la2f();
@@ -283,6 +285,8 @@ public interface Workspace {
public void ca2f(String left, String right, String leftCardinality, String
rightCardinalty);
public void da2f(Artifact2FeatureAssociation repositoryObject);
+
+ public void da2f(String filter) throws Exception;
/*** feature ***/
@@ -297,6 +301,8 @@ public interface Workspace {
public void cf(Map<String, String> attrs, Map<String, String> tags);
public void df(FeatureObject repositoryObject);
+
+ public void df(String filter) throws Exception;
/*** feature to distribution association ***/
@@ -309,6 +315,8 @@ public interface Workspace {
public void cf2d(String left, String right, String leftCardinality, String
rightCardinalty);
public void df2d(Feature2DistributionAssociation repositoryObject);
+
+ public void df2d(String filter) throws Exception;
/*** distribution ***/
@@ -323,6 +331,8 @@ public interface Workspace {
public void cd(Map<String, String> attrs, Map<String, String> tags);
public void dd(DistributionObject repositoryObject);
+
+ public void dd(String filter) throws Exception;
/*** distribution to target association ***/
@@ -335,6 +345,8 @@ public interface Workspace {
public void cd2t(String left, String right, String leftCardinality, String
rightCardinalty);
public void dd2t(Distribution2TargetAssociation repositoryObject);
+
+ public void dd2t(String filter) throws Exception;
/*** target ***/
@@ -349,6 +361,8 @@ public interface Workspace {
public RepositoryObject ct(Map<String, String> attrs, Map<String, String>
tags);
public void dt(StatefulTargetObject repositoryObject);
+
+ public void dt(String filter) throws Exception;
/**
* Approves a given stateful target object.
Modified:
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java
URL:
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java?rev=1629684&r1=1629683&r2=1629684&view=diff
==============================================================================
---
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java
(original)
+++
ace/trunk/org.apache.ace.client.workspace/src/org/apache/ace/client/workspace/impl/WorkspaceImpl.java
Mon Oct 6 15:46:16 2014
@@ -58,6 +58,8 @@ import org.osgi.framework.Filter;
import org.osgi.service.log.LogService;
import org.osgi.service.useradmin.User;
+import com.sun.corba.se.impl.oa.poa.AOMEntry;
+
public class WorkspaceImpl implements Workspace {
private final String m_sessionID;
@@ -517,6 +519,13 @@ public class WorkspaceImpl implements Wo
public void da(RepositoryObject repositoryObject) {
deleteRepositoryObject(ARTIFACT, repositoryObject.getDefinition());
}
+
+ @Override
+ public void da(String filter) throws Exception {
+ for (ArtifactObject object : la(filter)) {
+ deleteRepositoryObject(ARTIFACT, object.getDefinition());
+ }
+ }
@Override
public List<Artifact2FeatureAssociation> la2f() {
@@ -543,6 +552,14 @@ public class WorkspaceImpl implements Wo
public void da2f(Artifact2FeatureAssociation repositoryObject) {
deleteRepositoryObject(ARTIFACT2FEATURE,
repositoryObject.getDefinition());
}
+
+ @Override
+ public void da2f(String filter) throws Exception {
+ for (Artifact2FeatureAssociation object : la2f(filter)) {
+ deleteRepositoryObject(ARTIFACT2FEATURE,
object.getDefinition());
+ }
+
+ }
@Override
public List<FeatureObject> lf() {
@@ -576,6 +593,13 @@ public class WorkspaceImpl implements Wo
public void df(FeatureObject repositoryObject) {
deleteRepositoryObject(FEATURE, repositoryObject.getDefinition());
}
+
+ @Override
+ public void df(String filter) throws Exception {
+ for (FeatureObject object : lf(filter)) {
+ deleteRepositoryObject(FEATURE, object.getDefinition());
+ }
+ }
@Override
public List<Feature2DistributionAssociation> lf2d() {
@@ -602,6 +626,13 @@ public class WorkspaceImpl implements Wo
public void df2d(Feature2DistributionAssociation repositoryObject) {
deleteRepositoryObject(FEATURE2DISTRIBUTION,
repositoryObject.getDefinition());
}
+
+ @Override
+ public void df2d(String filter) throws Exception {
+ for (Feature2DistributionAssociation object : lf2d(filter)) {
+ deleteRepositoryObject(FEATURE2DISTRIBUTION,
object.getDefinition());
+ }
+ }
@Override
public List<DistributionObject> ld() {
@@ -637,6 +668,13 @@ public class WorkspaceImpl implements Wo
}
@Override
+ public void dd(String filter) throws Exception {
+ for (DistributionObject object : ld(filter)) {
+ deleteRepositoryObject(DISTRIBUTION, object.getDefinition());
+ }
+ }
+
+ @Override
public List<Distribution2TargetAssociation> ld2t() {
return getGenericRepositoryObjects(DISTRIBUTION2TARGET);
}
@@ -661,6 +699,13 @@ public class WorkspaceImpl implements Wo
public void dd2t(Distribution2TargetAssociation repositoryObject) {
deleteRepositoryObject(DISTRIBUTION2TARGET,
repositoryObject.getDefinition());
}
+
+ @Override
+ public void dd2t(String filter) throws Exception {
+ for (Distribution2TargetAssociation object : ld2t(filter)) {
+ deleteRepositoryObject(DISTRIBUTION2TARGET,
object.getDefinition());
+ }
+ }
@Override
public List<StatefulTargetObject> lt() {
@@ -694,6 +739,13 @@ public class WorkspaceImpl implements Wo
public void dt(StatefulTargetObject repositoryObject) {
deleteRepositoryObject(TARGET, repositoryObject.getDefinition());
}
+
+ @Override
+ public void dt(String filter) throws Exception {
+ for (StatefulTargetObject object : lt(filter)) {
+ deleteRepositoryObject(TARGET, object.getDefinition());
+ }
+ }
@Override
public StatefulTargetObject approveTarget(StatefulTargetObject
targetObject) {
