Changeset 857

Timestamp:

02/07/14 14:49:07 (10 years ago)

Author:

ngw8

Message:

Forgot to commit changes to classpath after adding library

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• src/org/expeditee/actions/JfxBrowserActions.java (modified) (4 diffs)

trunk/.classpath

@@ -18 +18 @@
         <classpathentry kind="lib" path="releases/jars/jazzy-core.jar"/>
         <classpathentry kind="lib" path="releases/jars/PDFRenderer-0.9.1.jar"/>
+        <classpathentry kind="lib" path="releases/json-simple-1.1.1.jar"/>
         <classpathentry kind="output" path="bin/src"/>
 </classpath>

trunk/src/org/expeditee/actions/JfxBrowserActions.java

@@ -188 +188 @@
                                         String queryForUrl = URLEncoder.encode(query.trim(), "UTF-8");
 
-                                        HttpURLConnection connection = (HttpURLConnection) (new URL("http://api.duckduckgo.com/?q=" + queryForUrl + "&format=json&no_html=1&t=expeditee").openConnection());
+                                        HttpURLConnection connection = (HttpURLConnection) (new URL("http://api.duckduckgo.com/?q=" + queryForUrl + "&format=json&no_html=1&no_redirect=1&t=expeditee").openConnection());
 
                                         Object parsedObject = parser.parse(new InputStreamReader(connection.getInputStream()));
@@ -269 +269 @@
                                         ddgLink.setFontStyle("italic");
 
-                                        titleItem.setPosition(FrameMouseActions.getPosition());
+
+                                        Picture pic = null;
 
                                         if (!picSource.equals("")) {
-                                                Picture pic = WebParser.getImageFromUrl(picSource, null, DisplayIO.getCurrentFrame(), titleItem.getX() - 55, titleItem.getY() - 14, 50, null, null,
+                                                pic = WebParser.getImageFromUrl(picSource, null, DisplayIO.getCurrentFrame(), 0, 0, 50, null, null,
                                                                 null, null, null, 0, 0);
                                                 items.add(pic);
@@ -278 +279 @@
                                         }
 
+                                        titleItem.setPosition(FrameMouseActions.getPosition());
                                         mainTextItem.setPosition(titleItem.getX(), titleItem.getY() + titleItem.getBoundsHeight());
                                         sourceItem.setPosition(mainTextItem.getX(), mainTextItem.getY() + mainTextItem.getBoundsHeight());
                                         ddgLink.setPosition(sourceItem.getX() + sourceItem.getBoundsWidth(), sourceItem.getY());
+
+                                        if (pic != null) {
+                                                pic.getSource().setPosition(titleItem.getX() - 55, titleItem.getY() - 14);
+                                        }
 
                                         items.add(titleItem);
@@ -287 +293 @@
                                         items.add(ddgLink);
                                         FrameMouseActions.pickup(items);
-                                } catch (MalformedURLException e) {
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
                                 } catch (IOException e) {
-                                        // TODO Auto-generated catch block
+                                        MessageBay.displayMessage("Problem loading results");
                                         e.printStackTrace();
                                 } catch (ParseException e) {
-                                        // TODO Auto-generated catch block
                                         e.printStackTrace();
                                 }