From 115f93a7d7d1b7f49c03a4dfcf45b728690a643c Mon Sep 17 00:00:00 2001 From: Jason King Date: Fri, 25 Nov 2011 14:42:56 +0000 Subject: [PATCH] Issue 695: Removed Row and Group: Use NamedResource instead --- .../tmrk/enterprisecloud/domain/Group.java | 31 ------------------- .../tmrk/enterprisecloud/domain/Layout.java | 10 +++--- .../tmrk/enterprisecloud/domain/Row.java | 30 ------------------ 3 files changed, 5 insertions(+), 66 deletions(-) delete mode 100644 sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Group.java delete mode 100644 sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Row.java diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Group.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Group.java deleted file mode 100644 index a8428e47f1..0000000000 --- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Group.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file - * to you 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.jclouds.tmrk.enterprisecloud.domain; - -import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseNamedResource; - -/** - * @author Jason King - */ -public class Group extends BaseNamedResource { - - public Group() { - //For JAXB - } -} diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Layout.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Layout.java index aea017a226..58405d36c0 100644 --- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Layout.java +++ b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Layout.java @@ -34,12 +34,12 @@ import javax.xml.bind.annotation.XmlElement; */ public class Layout { @XmlElement(name = "Group") - private Group group; + private NamedResource group; @XmlElement(name = "Row") - private Row row; + private NamedResource row; - public Layout(@Nullable Group group, @Nullable Row row) { + public Layout(@Nullable NamedResource group, @Nullable NamedResource row) { this.group = group; this.row = row; } @@ -48,11 +48,11 @@ public class Layout { //For JAXB } - public Group getGroup() { + public NamedResource getGroup() { return group; } - public Row getRow() { + public NamedResource getRow() { return row; } diff --git a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Row.java b/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Row.java deleted file mode 100644 index fe4e133dc0..0000000000 --- a/sandbox-providers/tmrk-enterprisecloud/src/main/java/org/jclouds/tmrk/enterprisecloud/domain/Row.java +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file - * to you 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.jclouds.tmrk.enterprisecloud.domain; - -import org.jclouds.tmrk.enterprisecloud.domain.internal.BaseNamedResource; - -/** - * @author Jason King - */ -public class Row extends BaseNamedResource { - public Row() { - //For JAXB - } -}