Fixed conflicts manually.

Nsyse · Aug 26, 2016 · bcfc052 · bcfc052
2 parents fafece0 + 79f6106
commit bcfc052
Show file tree

Hide file tree

Showing 14 changed files with 132 additions and 25 deletions.
diff --git a/LazyPoster V0,4 (last stable).jar b/LazyPoster V0,4 (last stable).jar
diff --git a/LazyPoster V0,4,2 (further testing required).jar b/LazyPoster V0,4,2 (further testing required).jar
diff --git a/LazyPoster V0,4,3.jar b/LazyPoster V0,4,3.jar
diff --git a/pom.xml b/pom.xml
@@ -10,6 +10,29 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <archive>
+                        <manifest>
+                            <mainClass>ca.nsyse.Main</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id> <!-- this is used for inheritance merges -->
+                        <phase>package</phase> <!-- bind to the packaging phase -->
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <!-- Build an executable JAR -->
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/main/java/ca/nsyse/Generators/ArtPostGenerators/FAArtGenerator.java b/src/main/java/ca/nsyse/Generators/ArtPostGenerators/FAArtGenerator.java
@@ -199,7 +199,7 @@ public void overwriteSeleniumTest() {
                 outStream.write("	<td>id=rating-type-general</td>");
             }
             else if(contentRating.equals("M")){
-                outStream.write("	<td>id=id=rating-type-mature</td>");
+                outStream.write("	<td>id=rating-type-mature</td>");
             }
             else if(contentRating.equals("A")){
                 outStream.write("	<td>id=rating-type-adult</td>");

diff --git a/src/main/java/ca/nsyse/Generators/ArtPostGenerators/SFArtGenerator.java b/src/main/java/ca/nsyse/Generators/ArtPostGenerators/SFArtGenerator.java
@@ -146,7 +146,27 @@ public void overwriteSeleniumTest() {
             outStream.newLine();
             outStream.write("</tr>");
             outStream.newLine();
-            outStream.write("");
+
+            outStream.write("<tr>");
+            outStream.newLine();
+            outStream.write("	<td>click</td>");
+            outStream.newLine();
+            String contentRating = getContentRating();
+            if (contentRating.equals("G")||contentRating.equals("T")){
+                outStream.write("	<td>id=UploadForm_contentLevel_0</td>");
+            }
+            else if(contentRating.equals("M")){
+                outStream.write("	<td>id=UploadForm_contentLevel_1</td>");
+            }
+            else if(contentRating.equals("A")){
+                outStream.write("	<td>id=UploadForm_contentLevel_2</td>");
+            }
+
+            outStream.newLine();
+            outStream.write("	<td></td>");
+            outStream.newLine();
+            outStream.write("</tr>");
+
             outStream.newLine();
             outStream.write("</tbody></table>");
             outStream.newLine();

diff --git a/src/main/java/ca/nsyse/SubmissionForms/ArtSubmissionForm/ArtSubmissionFormModel.java b/src/main/java/ca/nsyse/SubmissionForms/ArtSubmissionForm/ArtSubmissionFormModel.java
@@ -1,5 +1,7 @@
 package ca.nsyse.SubmissionForms.ArtSubmissionForm;
 
+import org.apache.commons.lang3.StringEscapeUtils;
+
 import java.util.ArrayList;
 
 /**
@@ -29,15 +31,16 @@ public ArtSubmissionFormModel(){
     }
 
     public String getSubmissionDescription() {
-        return submissionDescription;
+        String escapedDesc = StringEscapeUtils.escapeHtml4(submissionDescription);
+        return escapedDesc;
     }
-
     public void setSubmissionDescription(String submissionDescription) {
         this.submissionDescription = submissionDescription;
     }
 
     public String getSubmissionTitle() {
-        return submissionTitle;
+        String escapedTitle = StringEscapeUtils.escapeHtml4(submissionTitle);
+        return escapedTitle;
     }
 
     public void setSubmissionTitle(String submissionTitle) {

diff --git a/src/main/java/ca/nsyse/SubmissionForms/ArtSubmissionForm/CustomTextInputUtil.java b/src/main/java/ca/nsyse/SubmissionForms/ArtSubmissionForm/CustomTextInputUtil.java
@@ -0,0 +1,10 @@
+package ca.nsyse.SubmissionForms.ArtSubmissionForm;
+
+/**
+ * Created by Nsyse on 2016-08-26.
+ */
+public interface CustomTextInputUtil {
+    public  boolean isUnmodified();
+
+    void selectAllText();
+}
diff --git a/...ain/java/ca/nsyse/SubmissionForms/ArtSubmissionForm/SelectAllTextOnClickMouseAdapter.java b/...ain/java/ca/nsyse/SubmissionForms/ArtSubmissionForm/SelectAllTextOnClickMouseAdapter.java
@@ -1,6 +1,5 @@
 package ca.nsyse.SubmissionForms.ArtSubmissionForm;
 
-import javax.swing.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
@@ -9,24 +8,16 @@
  */
 public class SelectAllTextOnClickMouseAdapter extends MouseAdapter {
 
-    private JTextField manipulatedField;
-    private JTextArea manipulatedArea;
+    private CustomTextInputUtil manipulatedTextInput;
 
-    public SelectAllTextOnClickMouseAdapter(JTextField textField){
-        this.manipulatedField = textField;
-    }
-
-    public SelectAllTextOnClickMouseAdapter(JTextArea textArea){
-        this.manipulatedArea = textArea;
+    public SelectAllTextOnClickMouseAdapter(CustomTextInputUtil manipulatedTextInput){
+        this.manipulatedTextInput = manipulatedTextInput;
     }
 
     @Override
     public void mouseClicked(MouseEvent e) {
-        if (manipulatedArea==null){
-            manipulatedField.selectAll();
-        }
-        else{
-            manipulatedArea.selectAll();
+        if (manipulatedTextInput.isUnmodified()){
+            manipulatedTextInput.selectAllText();
         }
     }
 }
diff --git a/...ssionForms/ArtSubmissionForm/SubmissionFormElements/DescriptionSubmissionFormElement.java b/...ssionForms/ArtSubmissionForm/SubmissionFormElements/DescriptionSubmissionFormElement.java
@@ -18,7 +18,7 @@ public String getSubmissionDescription() {
     }
 
     private String submissionDescription;
-    private JTextArea descriptionField;
+    private SelectableJTextArea descriptionField;
     private Document areaDocument;
 
     private String defaultDescriptionFieldText = "<Enter description here>";
@@ -28,7 +28,7 @@ public DescriptionSubmissionFormElement(FormFrame listeningFrame){
         JLabel titleLabel = new JLabel("Submission description");
         titleLabel.setAlignmentX(Component.CENTER_ALIGNMENT);
 
-        this.descriptionField = new JTextArea(defaultDescriptionFieldText);
+        this.descriptionField = new SelectableJTextArea(defaultDescriptionFieldText);
         descriptionField.setMaximumSize(descriptionField.getPreferredSize());
         descriptionField.addMouseListener(new SelectAllTextOnClickMouseAdapter(descriptionField));
         descriptionField.setRows(15);

diff --git a/...a/nsyse/SubmissionForms/ArtSubmissionForm/SubmissionFormElements/SelectableJTextArea.java b/...a/nsyse/SubmissionForms/ArtSubmissionForm/SubmissionFormElements/SelectableJTextArea.java
@@ -0,0 +1,27 @@
+package ca.nsyse.SubmissionForms.ArtSubmissionForm.SubmissionFormElements;
+
+import ca.nsyse.SubmissionForms.ArtSubmissionForm.CustomTextInputUtil;
+
+import javax.swing.*;
+
+/**
+ * Created by Nsyse on 2016-08-26.
+ */
+public class SelectableJTextArea extends JTextArea implements CustomTextInputUtil{
+
+    private String defaultText;
+
+    public SelectableJTextArea(String defaultText){
+        super(defaultText);
+        this.defaultText = defaultText;
+    }
+
+    public boolean isUnmodified() {
+        return this.getText().equals(defaultText);
+    }
+
+    @Override
+    public void selectAllText() {
+        this.selectAll();
+    }
+}
diff --git a/.../nsyse/SubmissionForms/ArtSubmissionForm/SubmissionFormElements/SelectableJTextField.java b/.../nsyse/SubmissionForms/ArtSubmissionForm/SubmissionFormElements/SelectableJTextField.java
@@ -0,0 +1,33 @@
+package ca.nsyse.SubmissionForms.ArtSubmissionForm.SubmissionFormElements;
+
+import ca.nsyse.SubmissionForms.ArtSubmissionForm.CustomTextInputUtil;
+
+import javax.swing.*;
+
+/**
+ * Created by Nsyse on 2016-08-26.
+ */
+public class SelectableJTextField extends JTextField implements CustomTextInputUtil{
+
+    private final String defaultText;
+
+    public SelectableJTextField(String defaultText){
+        super(defaultText);
+        this.defaultText = defaultText;
+    }
+
+    public SelectableJTextField(String defaultText, int numberColumns){
+        super(defaultText, numberColumns);
+        this.defaultText = defaultText;
+    }
+
+    @Override
+    public boolean isUnmodified() {
+        return this.defaultText.equals(super.getText());
+    }
+
+    @Override
+    public void selectAllText() {
+        super.selectAll();
+    }
+}
diff --git a/...e/SubmissionForms/ArtSubmissionForm/SubmissionFormElements/TagsSubmissionFormElement.java b/...e/SubmissionForms/ArtSubmissionForm/SubmissionFormElements/TagsSubmissionFormElement.java
@@ -15,7 +15,7 @@
  */
 public class TagsSubmissionFormElement extends SubmissionFormElement {
 
-    private JTextField tagsField = new JTextField();
+    private SelectableJTextField tagsField;
     private String defaultTagFieldText = "<Enter tags here>";
 
     public TagsSubmissionFormElement(ArtFormFillerFrame listeningFrame) {
@@ -27,7 +27,7 @@ public TagsSubmissionFormElement(ArtFormFillerFrame listeningFrame) {
         this.add(titleLabel);
 
         //Prepare tag fields Panel
-        tagsField.setText(defaultTagFieldText);
+        tagsField = new SelectableJTextField(defaultTagFieldText);
         tagsField.addMouseListener(new SelectAllTextOnClickMouseAdapter(tagsField));
         this.add(tagsField);
 

diff --git a/.../SubmissionForms/ArtSubmissionForm/SubmissionFormElements/TitleSubmissionFormElement.java b/.../SubmissionForms/ArtSubmissionForm/SubmissionFormElements/TitleSubmissionFormElement.java
@@ -12,15 +12,15 @@
 public class TitleSubmissionFormElement extends SubmissionFormElement {
 
     private String submissionTitle;
-    private JTextField titleField;
+    private SelectableJTextField titleField;
 
     private String defaultTitleFieldText = "<Enter title here>";
 
     public TitleSubmissionFormElement(FormFrame listeningFrame){
         super(listeningFrame);
         JLabel titleLabel = new JLabel("Submission title");
         titleLabel.setAlignmentX(Component.CENTER_ALIGNMENT);
-        this.titleField = new JTextField(defaultTitleFieldText, 25);
+        this.titleField = new SelectableJTextField(defaultTitleFieldText, 25);
         titleField.setHorizontalAlignment(JTextField.CENTER);
         titleField.setMaximumSize(titleField.getPreferredSize());
         titleField.addMouseListener(new SelectAllTextOnClickMouseAdapter(titleField));