Fixed merge errors

tommyiversonj · Aug 21, 2009 · 66d607a · 66d607a
1 parent ca2cbb2
commit 66d607a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 35 deletions.
diff --git a/lunch_wicket/src/main/java/com/melexis/ProductList$ActionPanel.html b/lunch_wicket/src/main/java/com/melexis/ProductList$ActionPanel.html
@@ -1,7 +1,3 @@
 <wicket:panel>
-<<<<<<< HEAD:lunch_wicket/src/main/java/com/melexis/ProductList$ActionPanel.html
-<a href="#" wicket:id="delete">delete</a>
-=======
-    <a href="#" wicket:id="delete">delete</a> <a href="#" wicket:id="edit">edit</a>
->>>>>>> brh:lunch_wicket/src/main/java/com/melexis/ProductList$ActionPanel.html
+<a href="#" wicket:id="delete">delete</a> <a href="#" wicket:id="edit">edit</a>
 </wicket:panel>
diff --git a/lunch_wicket/src/main/java/com/melexis/ProductList.java b/lunch_wicket/src/main/java/com/melexis/ProductList.java
@@ -79,17 +79,6 @@ public ProductRepository getProducts() {
             return this.productRepository;
         }
 
-	public final class ActionPanel extends Panel {
-
-		public ActionPanel(String id, IModel<Product> model) {
-			super(id, model);
-
-
-		add(ajaxFallbackDefaultDataTable);
-		add(addProductForm);
-
-	}
-
 	public final class ActionPanel extends Panel {
 
 		public ActionPanel(String id, IModel<Product> model) {
@@ -105,25 +94,11 @@ public void onClick() {
 				}
 			});
 
-			add(new Link("edit") {
-
-				public void onClick() {
-					Product p = (Product) getParent().getDefaultModelObject();
-				}
-			});
-		}
-	}
-
-
-	public final class ProductForm extends Form {
-		private final Product product;
-		private Boolean add;
-
-
 			add(EditProduct.link("edit", model, productRepository));
 		}
 	}
 
+
 	public final class ProductForm extends Form {
 		private Product product;
 		private Boolean add;
@@ -137,10 +112,6 @@ public ProductForm(final String componentName, Product p) {
 			add = false;
 			product = p;
 			add(new Label("nameLabel", "name"));
-			add(new TextField("name", new PropertyModel(product, "name")));
-			add(new Label("priceLabel", "price"));
-			add(new TextField("price", new PropertyModel(product, "price")));
-
 			name = new TextField("name", new PropertyModel(product, "name"));
 			add(name);
 			add(new Label("priceLabel", "price"));