Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBJ Hargrave2014-01-21 21:33:57 +0000
committerBJ Hargrave2014-02-03 21:53:15 +0000
commitdfab51395599c4dac0341a1432684eadbe4aba5d (patch)
tree98083dfbeac29bd978966c4e70b856e5428ca7c7 /bundles/org.eclipse.osgi/osgi/src/org
parent671f07a1e03d1a1cc2a578fb049232ca71fdcfcc (diff)
downloadrt.equinox.framework-dfab51395599c4dac0341a1432684eadbe4aba5d.tar.gz
rt.equinox.framework-dfab51395599c4dac0341a1432684eadbe4aba5d.tar.xz
rt.equinox.framework-dfab51395599c4dac0341a1432684eadbe4aba5d.zip
Bug 427332: dto: Remove BundleRevisionsDTO and BundleWiringsDTO
The information can now be obtained by adapting to BundleRevisionDTO[] and BundleWiringDTO[]. Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi/osgi/src/org')
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionDTO.java6
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionsDTO.java37
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringDTO.java6
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringsDTO.java37
4 files changed, 6 insertions, 80 deletions
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionDTO.java
index f179f27f6..918ab5213 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionDTO.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2012). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2014). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import org.osgi.dto.resource.ResourceDTO;
* <p>
* An installed Bundle can be adapted to provide a {@code BundleRevisionDTO} for
* the current revision of the Bundle. {@code BundleRevisionDTO} objects for all
- * in use revisions of the Bundle can be obtained from a
- * {@link BundleRevisionsDTO} of the Bundle.
+ * in use revisions of the Bundle can be obtained by adapting the bundle to
+ * {@code BundleRevisionDTO[]}.
*
* @author $Id$
* @NotThreadSafe
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionsDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionsDTO.java
deleted file mode 100644
index 369f761b5..000000000
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionsDTO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) OSGi Alliance (2012). All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.osgi.dto.framework.wiring;
-
-import java.util.List;
-import org.osgi.dto.DTO;
-
-/**
- * Data Transfer Object for a BundleRevisions.
- *
- * <p>
- * A Bundle can be adapted to provide a {@code BundleRevisionsDTO} for the in
- * use revisions of the Bundle.
- *
- * @author $Id$
- * @NotThreadSafe
- */
-public class BundleRevisionsDTO extends DTO {
- /**
- * Revisions for the bundle. The first revision is the current revision.
- */
- public List<BundleRevisionDTO> revisions;
-}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringDTO.java
index 89865337a..ba026e560 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringDTO.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2012). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2014). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ import org.osgi.dto.resource.WiringDTO;
* <p>
* An installed Bundle can be adapted to provide a {@code BundleWiringDTO} for
* the current wiring Bundle. {@code BundleWiringDTO} objects for all in use
- * wirings of the Bundle can be obtained from a {@link BundleWiringsDTO} of the
- * Bundle.
+ * wirings of the Bundle can be obtained by adapting the bundle to
+ * {@code BundleWiringDTO[]}.
*
* <p>
* The {@link WiringDTO#providedWires providedWires} field must contain an array
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringsDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringsDTO.java
deleted file mode 100644
index 6c7b55776..000000000
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringsDTO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) OSGi Alliance (2012). All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.osgi.dto.framework.wiring;
-
-import java.util.List;
-import org.osgi.dto.DTO;
-
-/**
- * Data Transfer Object for the BundleWirings of a bundle.
- *
- * <p>
- * A Bundle can be adapted to provide a {@code BundleWiringsDTO} for the in use
- * wirings of the Bundle.
- *
- * @author $Id$
- * @NotThreadSafe
- */
-public class BundleWiringsDTO extends DTO {
- /**
- * Wirings for the bundle. The first wiring is the current wiring.
- */
- public List<BundleWiringDTO> wirings;
-}

Back to the top