Refactor3

Apromore-Core-Components/Apromore-Manager/src/main/java/org/apromore/service/ProcessService.java

@@ -137,7 +137,7 @@ ProcessModelVersion updateProcessModelVersion(final Integer processId, final Str
      * @param user with write permission
      * @throws UpdateProcessException if the user doesn't have write permission on any of the models
      */
-    void deleteProcessModel(List<ProcessData> models, User user) throws UpdateProcessException;;
+    void deleteProcessModel(List<ProcessData> models, User user) throws UpdateProcessException;
 
 
     /**
@@ -151,11 +151,4 @@ ProcessModelVersion updateProcessModelVersion(final Integer processId, final Str
      * @throws RepositoryException if for some reason the process model can not be found.
      */
     String getBPMNRepresentation(final String name, final Integer processId, final String branch, final Version version) throws RepositoryException;
-
-    /**
-     * Get folder that the associated Process is saved in
-     * @param pmv processSummaryType
-     * @return Folder
-     */
-    Folder getFolderByPmv(ProcessModelVersion pmv);
 }

Apromore-Core-Components/Apromore-Manager/src/main/java/org/apromore/service/impl/ProcessServiceImpl.java

@@ -24,24 +24,6 @@
  */
 package org.apromore.service.impl;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import javax.activation.DataHandler;
-import javax.inject.Inject;
-import javax.mail.util.ByteArrayDataSource;
-import javax.xml.bind.JAXBException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
 import org.apromore.aop.Event;
 import org.apromore.aop.HistoryEnum;
 import org.apromore.common.Constants;
@@ -87,6 +69,25 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.activation.DataHandler;
+import javax.inject.Inject;
+import javax.mail.util.ByteArrayDataSource;
+import javax.xml.bind.JAXBException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * Implementation of the ProcessService Contract.
  * 
@@ -566,13 +567,6 @@ public String getBPMNRepresentation(final String name, final Integer processId,
     }
   }
 
-  @Override
-  public Folder getFolderByPmv(ProcessModelVersion pmv) {
-
-    Process process = processRepo.findById(pmv.getId()).orElse(null);
-    return process.getFolder();
-  }
-
   private void deleteProcessModelVersion(List<ProcessModelVersion> pmvs,
       ProcessModelVersion pvidToDelete, ProcessBranch branch) throws ExceptionDao {
     ProcessModelVersion newCurrent = getPreviousVersion(pmvs, pvidToDelete);

Apromore-Core-Components/Apromore-Portal/src/main/webapp/WEB-INF/zk-label.properties

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 loganim_start_text = Start
 loganim_end_text = End
 loganim_backward_text = Backward
@@ -25,8 +24,8 @@ common_upload_text = Upload
 common_cut_text = Cut
 common_copy_text = Copy
 common_paste_text = Paste
-common_selectNone_text = Select all
-common_selectAll_text = Select none
+common_selectAll_text = Select all
+common_selectNone_text = Select none
 common_lastUpdated_text = Last updated
 common_modelName_text = Model name
 common_modelName_hint = Model name modification will be applied on all process versions.
@@ -330,7 +329,7 @@ plugin_redesign_searchModels_text = Search similar models
 common_frequencyLabel_text = frequency
 common_durationLabel_text = label
 common_error_text = Error
-=======
+
 theme = ap
 publish.enable = false
 brand.name = Apromore
@@ -513,7 +512,6 @@ error_message_header=Error message
 # bimp.zul
 logNameTextbox_label=Enter a log name
 saveButton_label=Save
-cancelButton_label=Cancel
 
 #invalidScenario.zul
 downloadReport_label=Download Error Report
@@ -572,5 +570,3 @@ setOtherAll_tooltiptext  = Change all Ignored Attributes to Event Attributes
 toXESButton_label        = Upload Log
 toPublicXESButton_label  = Upload Log Publicly
 cancelButton_label       = Cancel
-
->>>>>>> f6707b391... Add Spring boot support

Apromore-Core-Components/Apromore-Portal/src/main/webapp/WEB-INF/zk-label_ja.properties

@@ -24,8 +24,8 @@ common_upload_text = アップロード
 common_cut_text = カット
 common_copy_text = コピー
 common_paste_text = ペースト
-common_selectNone_text = すべて選択
-common_selectAll_text = 選択解除
+common_selectAll_text = すべて選択
+common_selectNone_text = 選択解除
 common_lastUpdated_text = 最終更新日
 common_modelName_text = モデル名
 common_modelName_hint = モデル名の変更は、すべてのプロセスバージョンに適用されます。

Apromore-Custom-Plugins/Process-Discoverer-Portal-Plugin/src/main/java/org/apromore/plugin/portal/processdiscoverer/eventlisteners/BPMNExportController.java

@@ -280,7 +280,7 @@ public void onEvent(Event event) throws Exception {
                                     now,  // creation timestamp
                                     now,  // last update timestamp
                                     publicModel);
-                            Folder folder = controller.getProcessService().getFolderByPmv(pmv);
+                            Folder folder = pmv.getProcessBranch().getProcess().getFolder();
                             String folderName = folder == null ? HOME_FOLDER_NAME : folder.getName();
                             String notif = MessageFormat.format(
                                 parent.getLabel("successSaveBPMN_message"),

Apromore-Custom-Plugins/User-Admin-Portal-Plugin/src/main/java/org/apromore/plugin/portal/useradmin/UserAdminController.java

@@ -21,6 +21,8 @@
  */
 package org.apromore.plugin.portal.useradmin;
 
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -56,13 +58,15 @@
 // import org.zkoss.spring.SpringUtil;
 import org.zkoss.json.JSONObject;
 import org.zkoss.web.Attributes;
+import org.zkoss.zk.ui.Execution;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.Sessions;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.EventQueue;
 import org.zkoss.zk.ui.event.EventQueues;
 import org.zkoss.zk.ui.event.SelectEvent;
+import org.zkoss.zk.ui.metainfo.PageDefinition;
 import org.zkoss.zk.ui.select.SelectorComposer;
 import org.zkoss.zk.ui.select.annotation.Listen;
 import org.zkoss.zk.ui.select.annotation.Wire;
@@ -918,7 +922,7 @@ public void onClickuserAddBtn() {
       arg.put("portalContext", portalContext);
       arg.put("securityService", securityService);
       Window window = (Window) Executions.getCurrent()
-          .createComponents("user-admin/zul/create-user.zul", getSelf(), arg);
+          .createComponents(getPageDefinition("zul/create-user.zul"), getSelf(), arg);
       window.doModal();
 
     } catch (Exception e) {
@@ -959,7 +963,7 @@ public void onEvent(Event e) {
                     Map arg = new HashMap<>();
                     arg.put("selectedUser", user);
                     Window window = (Window) Executions.getCurrent()
-                        .createComponents("user-admin/zul/delete-user.zul", getSelf(), arg);
+                        .createComponents(getPageDefinition("zul/delete-user.zul"), getSelf(), arg);
                     window.doModal();
                   } catch (Exception ex) {
                     LOGGER.error("Unable to create transfer owner dialog", ex);
@@ -1204,7 +1208,7 @@ public void onClickgroupAddBtn() {
       arg.put("portalContext", portalContext);
       arg.put("securityService", securityService);
       Window window = (Window) Executions.getCurrent()
-          .createComponents("user-admin/zul/create-group.zul", getSelf(), arg);
+          .createComponents(getPageDefinition("zul/create-group.zul"), getSelf(), arg);
       window.doModal();
 
     } catch (Exception e) {
@@ -1328,5 +1332,12 @@ public void onChangingGroupNameTextbox() {
     isGroupDetailDirty = true;
   }
 
+  public PageDefinition getPageDefinition(String uri) throws IOException {
+    String url = "static/" + uri;
+    Execution current = Executions.getCurrent();
+    PageDefinition pageDefinition=current.getPageDefinitionDirectly(new InputStreamReader(
+            getClass().getClassLoader().getResourceAsStream(url)), "zul");
+    return pageDefinition;
+  }
 
 }

Apromore-Custom-Plugins/User-Admin-Portal-Plugin/src/main/resources/static/zul/create-user.zul

@@ -28,7 +28,10 @@
         <rows>
             <row>
                 <label value="${$composer.labels.userName_text}"/>
-                <textbox id="userNameTextbox" value="New_username" constraint="no empty,/^[a-zA-Z0-9 @\\._\-]{4,}$/: {Use only letters, numbers, and @.-_}" placeholder="Username"/>
+                <textbox id="userNameTextbox" value="New_username"
+                         constraint="no empty,/^[a-zA-Z0-9 @\\._\-]{4,}$/:
+                         {Usernames must be at least 4 characters long, and include only letters, numbers, and @.-_}"
+                         placeholder="Username"/>
             </row>
             <row>
                 <label value="First Name"/>