minor code-style changes

dj3500 · Aug 20, 2014 · 3c1c090 · 3c1c090
1 parent 37bcb16
commit 3c1c090
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 23 deletions.
diff --git a/Hightail/src/org/hightail/SupportedSites.java b/Hightail/src/org/hightail/SupportedSites.java
@@ -3,9 +3,6 @@
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import javax.net.ssl.HttpsURLConnection;
-import javax.xml.ws.ProtocolException;
-import static org.hightail.SupportedSites.values;
 import org.hightail.parsers.contest.*;
 import org.hightail.parsers.task.*;
 import org.hightail.util.XTrustProvider;
@@ -23,8 +20,7 @@ public enum SupportedSites {
     Jutge       (
             "jutge",
             new JutgeTaskParser(),
-            new JutgeContestParser()
-            )
+            new JutgeContestParser())
     ;
 
     private TaskParser taskParser;
@@ -43,8 +39,11 @@ public String getDirectory() {
 
     private static void verifyURL(String url) throws ParserException {
         try {
-            if(url.contains("jutge."))
+            if (url.contains("jutge.")) {
+                // workaround to cope with the SSL cerificate problem on Jutge
+                // this is needed also for the task parser itself to work (this method gets called before the task parser)
                 XTrustProvider.install();
+            }
             URL u = new URL(url);
             HttpURLConnection conn = (HttpURLConnection) u.openConnection();
             conn.setRequestMethod("GET");
@@ -53,7 +52,7 @@ private static void verifyURL(String url) throws ParserException {
             if (code != 200) {
                 throw new ParserException("Incorrect URL.");
             }
-        }catch (IOException ex) {
+        } catch (IOException ex) {
             throw new ParserException("Malformed URL.");
         }
     }

diff --git a/Hightail/src/org/hightail/parsers/contest/JutgeContestParser.java b/Hightail/src/org/hightail/parsers/contest/JutgeContestParser.java
@@ -1,18 +1,8 @@
 package org.hightail.parsers.contest;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
 import org.hightail.Problem;
-import org.hightail.parsers.task.JutgeTaskParser;
-import org.hightail.parsers.task.TaskParser;
-import org.htmlparser.Node;
-import org.htmlparser.Parser;
-import org.htmlparser.filters.LinkRegexFilter;
-import org.htmlparser.tags.LinkTag;
 import org.htmlparser.util.ParserException;
-import org.htmlparser.visitors.TagFindingVisitor;
 
 /**
  * Jutge (UPC local online judge) contest parser.
@@ -27,7 +17,7 @@ Problem lists (which can be interpreted as contests) are only available if you a
             Also, it doesn't make much sense here since most problems are public and they are usually solved
             one by one in pratice.
         */
-        throw new ParserException("Parsing failed.");
+        throw new ParserException("Contest parser for Jutge is not implemented.");
     }
 
     @Override

diff --git a/Hightail/src/org/hightail/parsers/task/JutgeTaskParser.java b/Hightail/src/org/hightail/parsers/task/JutgeTaskParser.java
@@ -87,8 +87,9 @@ private ArrayList<String> extractInputsOrOutputs (FilterBean fb, boolean isInput
             as output. I hope that there is no problem which has "/pre" as output.
         */
         for(int i=0; i<inputs.size(); ++i) {
-            if(inputs.get(i).equals("/pre"))
+            if(inputs.get(i).equals("/pre")) {
                 inputs.set(i,"");
+            }
         }
         return inputs;
     }

diff --git a/Hightail/src/org/hightail/ui/ProblemJPanel.form b/Hightail/src/org/hightail/ui/ProblemJPanel.form
@@ -95,12 +95,12 @@
                           <Component id="saveTestsButton" alignment="3" max="32767" attributes="0"/>
                           <Component id="copyInputButton" alignment="3" max="32767" attributes="0"/>
                       </Group>
-                      <Component id="deleteTestcaseButton" alignment="0" max="32767" attributes="0"/>
                       <Component id="editTestcaseButton" alignment="0" max="32767" attributes="0"/>
                       <Component id="newTestcaseButton" alignment="0" max="32767" attributes="0"/>
                       <Component id="abortCurrentTestButton" alignment="0" max="32767" attributes="0"/>
                       <Component id="runTestsButton" alignment="0" max="32767" attributes="0"/>
                       <Component id="abortAllTestsButton" alignment="0" max="32767" attributes="0"/>
+                      <Component id="deleteTestcaseButton" alignment="1" max="32767" attributes="0"/>
                   </Group>
               </Group>
           </Group>

diff --git a/Hightail/src/org/hightail/ui/ProblemJPanel.java b/Hightail/src/org/hightail/ui/ProblemJPanel.java
@@ -194,12 +194,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                     .addGroup(testcasePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                         .addComponent(saveTestsButton)
                         .addComponent(copyInputButton))
-                    .addComponent(deleteTestcaseButton)
                     .addComponent(editTestcaseButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(newTestcaseButton)
                     .addComponent(abortCurrentTestButton)
                     .addComponent(runTestsButton)
-                    .addComponent(abortAllTestsButton)))
+                    .addComponent(abortAllTestsButton)
+                    .addComponent(deleteTestcaseButton, javax.swing.GroupLayout.Alignment.TRAILING)))
         );
 
         openContainingDirectoryButton.setText("Browse...");

diff --git a/Hightail/src/org/hightail/util/XTrustProvider.java b/Hightail/src/org/hightail/util/XTrustProvider.java
@@ -38,7 +38,6 @@
 import java.security.PrivilegedAction;
 import java.security.Security;
 import java.security.cert.X509Certificate;
-
 import javax.net.ssl.ManagerFactoryParameters;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactorySpi;