Loading src/main/java/ecorp/easy/installer/controllers/steps/ExecutableStepController.java 0 → 100644 +24 −0 Original line number Diff line number Diff line /* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ package ecorp.easy.installer.controllers.steps; import java.net.URL; import java.util.ResourceBundle; /** * * @author vincent */ public class ExecutableStepController extends StepController{ @Override public void initialize(URL arg0, ResourceBundle resources) { super.initialize(arg0, resources); //To change body of generated methods, choose Tools | Templates. } } src/main/java/ecorp/easy/installer/controllers/subcontrollers/EAccountController.java→src/main/java/ecorp/easy/installer/controllers/steps/GetAccountController.java +5 −9 Original line number Diff line number Diff line Loading @@ -14,9 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package ecorp.easy.installer.controllers.subcontrollers; package ecorp.easy.installer.controllers.steps; import ecorp.easy.installer.controllers.MainWindowController; import ecorp.easy.installer.controllers.subcontrollers.AbstractSubController; import ecorp.easy.installer.tasks.AskAccountTask; import java.net.URL; import java.util.ResourceBundle; Loading @@ -41,8 +42,8 @@ import org.slf4j.LoggerFactory; * @author vincent * This is the controller for eAccount.fxml */ public class EAccountController extends AbstractSubController{ private static final Logger logger = LoggerFactory.getLogger(EAccountController.class); public class GetAccountController extends StepController{ private static final Logger logger = LoggerFactory.getLogger(GetAccountController.class); private static final String MAIL_REGEX="[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?"; private static final Pattern EMAIL_PATTERN = Pattern.compile(MAIL_REGEX); Loading @@ -59,11 +60,6 @@ public class EAccountController extends AbstractSubController{ @Override public void initialize(URL location, ResourceBundle resources){ super.initialize(location, resources); } @Override public void setParentController(MainWindowController parentController){ super.setParentController(parentController); parentController.disableNextButton(true); radioButton.setOnMouseClicked( (eh) -> { mailInput.requestFocus(); Loading Loading @@ -93,10 +89,10 @@ public class EAccountController extends AbstractSubController{ radioButton2.getLayoutX(), radioButton2.getLayoutY(), radioButton2.getLayoutX(), radioButton2.getLayoutY(), MouseButton.PRIMARY, 1, true, true, true, true, true, true, true, true, true, true, null)); }); } public void onCheckMailBtnClick(){ logger.info("onCheckMailBtnClick"); final String userInput = mailInput.getText(); Loading src/main/resources/fxml/6-2-eAccount.fxml→src/main/resources/fxml/getAccount.fxml +0 −0 File moved. View file Loading
src/main/java/ecorp/easy/installer/controllers/steps/ExecutableStepController.java 0 → 100644 +24 −0 Original line number Diff line number Diff line /* * To change this license header, choose License Headers in Project Properties. * To change this template file, choose Tools | Templates * and open the template in the editor. */ package ecorp.easy.installer.controllers.steps; import java.net.URL; import java.util.ResourceBundle; /** * * @author vincent */ public class ExecutableStepController extends StepController{ @Override public void initialize(URL arg0, ResourceBundle resources) { super.initialize(arg0, resources); //To change body of generated methods, choose Tools | Templates. } }
src/main/java/ecorp/easy/installer/controllers/subcontrollers/EAccountController.java→src/main/java/ecorp/easy/installer/controllers/steps/GetAccountController.java +5 −9 Original line number Diff line number Diff line Loading @@ -14,9 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ package ecorp.easy.installer.controllers.subcontrollers; package ecorp.easy.installer.controllers.steps; import ecorp.easy.installer.controllers.MainWindowController; import ecorp.easy.installer.controllers.subcontrollers.AbstractSubController; import ecorp.easy.installer.tasks.AskAccountTask; import java.net.URL; import java.util.ResourceBundle; Loading @@ -41,8 +42,8 @@ import org.slf4j.LoggerFactory; * @author vincent * This is the controller for eAccount.fxml */ public class EAccountController extends AbstractSubController{ private static final Logger logger = LoggerFactory.getLogger(EAccountController.class); public class GetAccountController extends StepController{ private static final Logger logger = LoggerFactory.getLogger(GetAccountController.class); private static final String MAIL_REGEX="[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?"; private static final Pattern EMAIL_PATTERN = Pattern.compile(MAIL_REGEX); Loading @@ -59,11 +60,6 @@ public class EAccountController extends AbstractSubController{ @Override public void initialize(URL location, ResourceBundle resources){ super.initialize(location, resources); } @Override public void setParentController(MainWindowController parentController){ super.setParentController(parentController); parentController.disableNextButton(true); radioButton.setOnMouseClicked( (eh) -> { mailInput.requestFocus(); Loading Loading @@ -93,10 +89,10 @@ public class EAccountController extends AbstractSubController{ radioButton2.getLayoutX(), radioButton2.getLayoutY(), radioButton2.getLayoutX(), radioButton2.getLayoutY(), MouseButton.PRIMARY, 1, true, true, true, true, true, true, true, true, true, true, null)); }); } public void onCheckMailBtnClick(){ logger.info("onCheckMailBtnClick"); final String userInput = mailInput.getText(); Loading
src/main/resources/fxml/6-2-eAccount.fxml→src/main/resources/fxml/getAccount.fxml +0 −0 File moved. View file