소스 검색

No redundancy in panel namespaces and class names.

Sam Jaffe 5 년 전
부모
커밋
46d510e84e

+ 3 - 3
src/main/lombok/org/leumasjaffe/recipe/view/summary/ElementSummaryPanel.java

@@ -19,12 +19,12 @@ import java.awt.GridBagConstraints;
 
 @SuppressWarnings("serial")
 @FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
-public class ElementSummaryPanel extends JPanel {
+public class ElementPanel extends JPanel {
 	ObservableListener<JPanel, Element> listener;
 	@Getter(AccessLevel.PACKAGE) JLabel lblProductName;
 	@Getter(AccessLevel.PACKAGE) JPanel panelIngredients;
 	
-	public ElementSummaryPanel(final Element element) {
+	public ElementPanel(final Element element) {
 		GridBagLayout gridBagLayout = new GridBagLayout();
 		gridBagLayout.columnWidths = new int[]{0, 0, 0};
 		gridBagLayout.rowHeights = new int[]{0, 0, 0};
@@ -51,7 +51,7 @@ public class ElementSummaryPanel extends JPanel {
 		
 		listener = new ObservableListener<>(panelIngredients, (c, t) -> {
 			c.removeAll();
-			element.getIngredients().stream().map(SummaryIngredientPanel::new).forEach(c::add);
+			element.getIngredients().stream().map(IngredientPanel::new).forEach(c::add);
 		});
 		listener.setObserved(element);
 	}

+ 3 - 3
src/main/lombok/org/leumasjaffe/recipe/view/summary/SummaryIngredientPanel.java

@@ -24,13 +24,13 @@ import javax.swing.JLabel;
 
 @SuppressWarnings("serial")
 @FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
-public class SummaryIngredientPanel extends JPanel {
-	ObservableListener<SummaryIngredientPanel, Ingredient> listener;
+public class IngredientPanel extends JPanel {
+	ObservableListener<IngredientPanel, Ingredient> listener;
 	@Getter(AccessLevel.PACKAGE) JTextField txtName;
 	@Getter(AccessLevel.PACKAGE) JFormattedTextField txtAmount;
 	@Getter(AccessLevel.PACKAGE) JTextField txtUnit;
 	
-	public SummaryIngredientPanel(final Ingredient ingredient) {
+	public IngredientPanel(final Ingredient ingredient) {
 		GridBagLayout gridBagLayout = new GridBagLayout();
 		gridBagLayout.columnWidths = new int[]{0, 0, 0, 0, 0};
 		gridBagLayout.rowHeights = new int[]{0, 0};

+ 1 - 1
src/main/lombok/org/leumasjaffe/recipe/view/summary/SummaryPanel.java

@@ -91,7 +91,7 @@ public class SummaryPanel extends JPanel {
 	}
 
 	public void addProduct(final Element comp) {
-		panelIngredients.add(new ElementSummaryPanel(comp));
+		panelIngredients.add(new ElementPanel(comp));
 		panelIngredients.add(new JSeparator());
 	}
 }

+ 3 - 3
src/test/java/org/leumasjaffe/recipe/view/summary/ElementSummaryPanelTest.java

@@ -22,10 +22,10 @@ import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
 @RunWith(JUnitPlatform.class)
-class ElementSummaryPanelTest extends SwingTestCase {
+class ElementPanelTest extends SwingTestCase {
 	
 	@Mock Element stuff;
-	ElementSummaryPanel panel;
+	ElementPanel panel;
 	
 	@BeforeEach
 	void setUp() {
@@ -35,7 +35,7 @@ class ElementSummaryPanelTest extends SwingTestCase {
 				new Ingredient("Garlic", "", new Amount("2 tsp"))))
 		.when(stuff).getIngredients();
 		
-		panel = new ElementSummaryPanel(stuff);
+		panel = new ElementPanel(stuff);
 	}
 
 	@Test

+ 3 - 3
src/test/java/org/leumasjaffe/recipe/view/summary/SummaryIngredientPanelTest.java

@@ -9,15 +9,15 @@ import org.leumasjaffe.recipe.model.Amount;
 import org.leumasjaffe.recipe.model.Ingredient;
 import org.leumasjaffe.recipe.view.SwingTestCase;
 
-class SummaryIngredientPanelTest extends SwingTestCase {
+class IngredientPanelTest extends SwingTestCase {
 
 	Ingredient stuff;
-	SummaryIngredientPanel panel;
+	IngredientPanel panel;
 	
 	@BeforeEach
 	void setUp() {
 		stuff = new Ingredient("Onions", "Sliced", new Amount("100 g"));
-		panel = new SummaryIngredientPanel(stuff);
+		panel = new IngredientPanel(stuff);
 	}
 
 	@Test