Forráskód Böngészése

Rename ReplaceChildrenController -> ReplaceChildrenAction

Sam Jaffe 5 éve
szülő
commit
22598f1e90

+ 1 - 1
src/main/lombok/org/leumasjaffe/recipe/controller/ReplaceChildrenController.java

@@ -12,7 +12,7 @@ import lombok.experimental.FieldDefaults;
 
 @RequiredArgsConstructor
 @FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
-public class ReplaceChildrenController<T, V> implements BiConsumer<Container, T> {
+public class ReplaceChildrenAction<T, V> implements BiConsumer<Container, T> {
 	Function<T, ? extends Collection<V>> getChildren;
 	Function<? super V, ? extends Component> makeView;
 	

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

@@ -7,7 +7,7 @@ import org.leumasjaffe.observer.IndirectObservableListener;
 import org.leumasjaffe.observer.ObservableController;
 import org.leumasjaffe.observer.ObservableListener;
 import org.leumasjaffe.observer.ObserverDispatch;
-import org.leumasjaffe.recipe.controller.ReplaceChildrenController;
+import org.leumasjaffe.recipe.controller.ReplaceChildrenAction;
 import org.leumasjaffe.recipe.model.Duration;
 import org.leumasjaffe.recipe.model.Ingredient;
 import org.leumasjaffe.recipe.model.Phase;
@@ -29,12 +29,12 @@ import javax.swing.JFormattedTextField;
 @SuppressWarnings("serial")
 @FieldDefaults(level=AccessLevel.PRIVATE)
 public class PreparationPanel extends JPanel {
-	ReplaceChildrenController<Preparation, Ingredient> controller;
+	ReplaceChildrenAction<Preparation, Ingredient> controller;
 	IndirectObservableListener<JPanel, Preparation> childListener;
 	ObservableListener<JFormattedTextField, Preparation> durationController;
 	
 	public PreparationPanel() {
-		controller = new ReplaceChildrenController<>(Preparation::getIngredients,
+		controller = new ReplaceChildrenAction<>(Preparation::getIngredients,
 				IngredientPreparationPanel::new);
 		
 		GridBagLayout gridBagLayout = new GridBagLayout();

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

@@ -5,7 +5,7 @@ import javax.swing.JPanel;
 import org.jdesktop.swingx.VerticalLayout;
 import org.leumasjaffe.observer.ObservableListener;
 import org.leumasjaffe.observer.ObserverDispatch;
-import org.leumasjaffe.recipe.controller.ReplaceChildrenController;
+import org.leumasjaffe.recipe.controller.ReplaceChildrenAction;
 import org.leumasjaffe.recipe.model.Element;
 import org.leumasjaffe.recipe.model.Ingredient;
 
@@ -22,7 +22,7 @@ import java.awt.GridBagConstraints;
 @SuppressWarnings("serial")
 @FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
 public class ElementPanel extends JPanel {
-	ReplaceChildrenController<Element, Ingredient> controller;
+	ReplaceChildrenAction<Element, Ingredient> controller;
 	ObservableListener<JLabel, Element> nameListener;
 	ObservableListener<JPanel, Element> childListener;
 	
@@ -30,7 +30,7 @@ public class ElementPanel extends JPanel {
 	@Getter(AccessLevel.PACKAGE) JPanel panelIngredients;
 	
 	public ElementPanel(final Element element) {
-		controller = new ReplaceChildrenController<>(
+		controller = new ReplaceChildrenAction<>(
 				Element::getIngredients, IngredientPanel::new);
 		GridBagLayout gridBagLayout = new GridBagLayout();
 		gridBagLayout.columnWidths = new int[]{0, 0, 0};

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

@@ -13,7 +13,7 @@ import javax.swing.SpinnerNumberModel;
 import org.jdesktop.swingx.VerticalLayout;
 import org.leumasjaffe.observer.ObservableListener;
 import org.leumasjaffe.observer.ObserverDispatch;
-import org.leumasjaffe.recipe.controller.ReplaceChildrenController;
+import org.leumasjaffe.recipe.controller.ReplaceChildrenAction;
 import org.leumasjaffe.recipe.controller.SpinnerBinding;
 import org.leumasjaffe.recipe.controller.TextBinding;
 import org.leumasjaffe.recipe.model.Element;
@@ -29,7 +29,7 @@ import javax.swing.JSpinner;
 @SuppressWarnings("serial")
 @FieldDefaults(level=AccessLevel.PRIVATE)
 public class SummaryPanel extends JPanel {
-	ReplaceChildrenController<RecipeCard, Element> controller;
+	ReplaceChildrenAction<RecipeCard, Element> controller;
 	TextBinding<RecipeCard> titleBinding;
 	SpinnerBinding<RecipeCard, Integer> servingsBinding;
 	TextBinding<RecipeCard> descriptionBinding;
@@ -40,7 +40,7 @@ public class SummaryPanel extends JPanel {
 	JTextArea txaDescription;
 	
 	public SummaryPanel() {
-		controller = new ReplaceChildrenController<>(RecipeCard::getElements, element -> {
+		controller = new ReplaceChildrenAction<>(RecipeCard::getElements, element -> {
 			JPanel wrapper = new JPanel(new VerticalLayout());
 			wrapper.add(new ElementPanel(element));
 			wrapper.add(new JSeparator());

+ 2 - 2
src/test/java/org/leumasjaffe/recipe/controller/ReplaceChildrenControllerTest.java

@@ -23,11 +23,11 @@ class ReplaceChildrenControllerTest {
 	@Mock Container parent;
 	Function<Void, Collection<Void>> getChildren = (v) -> Arrays.asList(null, null);
 	Function<Void, Component> makeView = (v) -> mock(Component.class);
-	ReplaceChildrenController<Void, Void> controller;
+	ReplaceChildrenAction<Void, Void> controller;
 	
 	@BeforeEach
 	void setUp() {
-		controller = new ReplaceChildrenController<>(getChildren, makeView);
+		controller = new ReplaceChildrenAction<>(getChildren, makeView);
 	}
 
 	@Test

+ 2 - 2
src/test/java/org/leumasjaffe/recipe/view/PreparationPanelTest.java

@@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.leumasjaffe.observer.ObservableListener;
 import org.leumasjaffe.observer.ObserverDispatch;
-import org.leumasjaffe.recipe.controller.ReplaceChildrenController;
+import org.leumasjaffe.recipe.controller.ReplaceChildrenAction;
 import org.leumasjaffe.recipe.model.Ingredient;
 import org.leumasjaffe.recipe.model.Phase;
 import org.leumasjaffe.recipe.model.Preparation;
@@ -21,7 +21,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 class PreparationPanelTest extends SwingTestCase {
 	
 	@Mock ObservableListener<JFormattedTextField, Preparation> durationController;
-	@Mock ReplaceChildrenController<Preparation, Ingredient> controller;
+	@Mock ReplaceChildrenAction<Preparation, Ingredient> controller;
 	Preparation stuff = new Preparation();
 	@Mock Phase parent;
 	@InjectMocks PreparationPanel panel = new PreparationPanel();

+ 2 - 2
src/test/java/org/leumasjaffe/recipe/view/summary/SummaryPanelTest.java

@@ -5,7 +5,7 @@ import static org.mockito.Mockito.*;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.leumasjaffe.observer.ObserverDispatch;
-import org.leumasjaffe.recipe.controller.ReplaceChildrenController;
+import org.leumasjaffe.recipe.controller.ReplaceChildrenAction;
 import org.leumasjaffe.recipe.model.Element;
 import org.leumasjaffe.recipe.model.RecipeCard;
 import org.mockito.InjectMocks;
@@ -16,7 +16,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 class SummaryPanelTest {
 	
 	RecipeCard card = new RecipeCard();
-	@Mock ReplaceChildrenController<RecipeCard, Element> controller;
+	@Mock ReplaceChildrenAction<RecipeCard, Element> controller;
 	@InjectMocks SummaryPanel panel = new SummaryPanel(card);
 
 	@Test