Fixes some little cosmetic things
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/AsterixSDKServlet.java b/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/AsterixSDKServlet.java
index ba17d5e..c7e4f3b 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/AsterixSDKServlet.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/api/http/servlet/AsterixSDKServlet.java
@@ -21,51 +21,48 @@
String requestURI = request.getRequestURI();
String contentType = "application/javascript";
- if (requestURI.startsWith("/sdk/static/")) {
-
- InputStream is = APIServlet.class.getResourceAsStream(requestURI);
- if (is == null) {
- response.sendError(HttpServletResponse.SC_NOT_FOUND);
- return;
- }
-
- if (requestURI.endsWith(".png")) {
-
- BufferedImage img = ImageIO.read(is);
- OutputStream outputStream = response.getOutputStream();
- String formatName = "png";
- response.setContentType("image/png");
- ImageIO.write(img, formatName, outputStream);
- outputStream.close();
- return;
-
- }
-
- if (requestURI.endsWith("html")) {
- contentType = "text/html";
- } else if (requestURI.endsWith("css")) {
- contentType = "text/css";
- }
-
- response.setContentType(contentType);
- response.setCharacterEncoding("utf-8");
-
- PrintWriter out = response.getWriter();
- InputStreamReader isr = new InputStreamReader(is);
- StringBuilder sb = new StringBuilder();
- BufferedReader br = new BufferedReader(isr);
- String line = br.readLine();
-
- while (line != null) {
- sb.append(line);
- sb.append("\n");
- line = br.readLine();
- }
-
- out.println(sb.toString());
-
+ InputStream is = APIServlet.class.getResourceAsStream(requestURI);
+ if (is == null) {
+ response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
}
+
+ if (requestURI.endsWith(".png")) {
+
+ BufferedImage img = ImageIO.read(is);
+ OutputStream outputStream = response.getOutputStream();
+ String formatName = "png";
+ response.setContentType("image/png");
+ ImageIO.write(img, formatName, outputStream);
+ outputStream.close();
+ return;
+
+ }
+
+ if (requestURI.endsWith("html")) {
+ contentType = "text/html";
+ } else if (requestURI.endsWith("css")) {
+ contentType = "text/css";
+ }
+
+ response.setContentType(contentType);
+ response.setCharacterEncoding("utf-8");
+
+ PrintWriter out = response.getWriter();
+ InputStreamReader isr = new InputStreamReader(is);
+ StringBuilder sb = new StringBuilder();
+ BufferedReader br = new BufferedReader(isr);
+ String line = br.readLine();
+
+ while (line != null) {
+ sb.append(line);
+ sb.append("\n");
+ line = br.readLine();
+ }
+
+ out.println(sb.toString());
+
+ return;
}
}
diff --git a/asterix-app/src/main/resources/sdk/static/cherry/examples/cherry.html b/asterix-app/src/main/resources/sdk/static/cherry/examples/cherry.html
index 874e370..7059e24 100755
--- a/asterix-app/src/main/resources/sdk/static/cherry/examples/cherry.html
+++ b/asterix-app/src/main/resources/sdk/static/cherry/examples/cherry.html
@@ -8,7 +8,7 @@
rel="stylesheet" type="text/css"/>
<link href="../css/bootstrap.min.css" rel="stylesheet" media="screen">
- <link rel="shortcut icon" type="image/png" href="../img/mobile.png">
+ <link rel="shortcut icon" type="image/png" href="../img/hyrax.png">
<script src="http://maps.googleapis.com/maps/api/js?sensor=false&libraries=places"
type="text/javascript"></script>
@@ -63,7 +63,7 @@
<!-- Nav -->
<div class="navbar">
<div class="navbar-inner">
- <a class="brand" href="#" style="padding: 0.25em;"><img src="../img/asterixlogo.png" height="30" width="72"></a>
+ <a class="brand" href="#" style="padding: 0.25em;"><img src="/webui/static/img/finalasterixlogo.png" height="30" width="72"></a>
<ul class="nav">
<li id="explore-active" class="active"><a id="explore-mode" href="#">Explore</a></li>
<li id="review-active" ><a id="review-mode" href="#">Review</a></li>
diff --git a/asterix-app/src/main/resources/sdk/static/cherry/js/cherry.js b/asterix-app/src/main/resources/sdk/static/cherry/js/cherry.js
index 82c7dac..b3be8ec 100755
--- a/asterix-app/src/main/resources/sdk/static/cherry/js/cherry.js
+++ b/asterix-app/src/main/resources/sdk/static/cherry/js/cherry.js
@@ -23,7 +23,7 @@
param_placeholder = {};
map.setZoom(4);
- map.setCenter(new google.maps.LatLng(38.89, -77.03));
+ map.setCenter(new google.maps.LatLng(38.89, 77.03));
$('#query-preview-window').html('');
$("#metatweetzone").html('');
@@ -135,8 +135,6 @@
shouldDraw = true;
}
});
-
- //triggerUIUpdateOnNewTweetBook({"title" : "Party"});
google.maps.event.addListener(map, 'mousemove', drawRect);
function drawRect (event) {