From 4cb2de9cc1c5bf387d5cf81ab12fd9b0e16d9fc4 Mon Sep 17 00:00:00 2001 From: Ugnich Anton Date: Sun, 28 Oct 2012 15:48:57 +0700 Subject: "http:" removed. --- nbproject/project.properties | 1 + src/java/com/juick/http/www/NewMessage.java | 8 ++++---- src/java/com/juick/http/www/PageTemplates.java | 22 +++++++++++----------- src/java/com/juick/http/www/User.java | 6 +++--- src/java/com/juick/http/www/UserThread.java | 18 +++++++++--------- web/post3.js | 2 +- web/scripts3.js | 8 ++++---- 7 files changed, 33 insertions(+), 32 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index e4bb4d38..1b4e5382 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,5 +1,6 @@ annotation.processing.enabled=true annotation.processing.enabled.in.editor=true +annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output build.classes.dir=${build.web.dir}/WEB-INF/classes diff --git a/src/java/com/juick/http/www/NewMessage.java b/src/java/com/juick/http/www/NewMessage.java index 1e00a553..36ff190a 100644 --- a/src/java/com/juick/http/www/NewMessage.java +++ b/src/java/com/juick/http/www/NewMessage.java @@ -44,10 +44,10 @@ public class NewMessage { response.setContentType("text/html; charset=UTF-8"); PrintWriter out = response.getWriter(); try { - PageTemplates.pageHead(out, rbnm.getString("New message"), "" - + "" - + "" - + ""); + PageTemplates.pageHead(out, rbnm.getString("New message"), "" + + "" + + "" + + ""); PageTemplates.pageNavigation(out, locale, visitor); out.println("
"); diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java index b977cc0d..e8f96be3 100644 --- a/src/java/com/juick/http/www/PageTemplates.java +++ b/src/java/com/juick/http/www/PageTemplates.java @@ -54,11 +54,11 @@ public class PageTemplates { out.println(""); out.println(" "); out.println(" " + title + ""); - out.println(" "); - out.println(" "); - out.println(" "); - out.println(" "); - out.println(" "); + out.println(" "); + out.println(" "); + out.println(" "); + out.println(" "); + out.println(" "); if (headers != null) { out.println(headers); } @@ -71,14 +71,14 @@ public class PageTemplates { ResourceBundle rb = ResourceBundle.getBundle("Global", loc); out.println("
"); out.println("
"); - out.println("
\"Juick\"/
"); + out.println("
\"Juick\"/
"); out.println("
"); out.println("
\">
"); out.println("
"); out.println("
    "); if (user != null) { out.println("
  • " + rb.getString("Post") + "
    • "); - out.println("
  • \""" + user.UName + "
      "); + out.println("
    • \""" + user.UName + "
        "); out.println("
      • " + rb.getString("Blog") + "
        • "); out.println("
      • " + rb.getString("Settings") + "
        • "); out.println("
      • " + rb.getString("Logout") + "
        • "); @@ -135,7 +135,7 @@ public class PageTemplates { } out.println("
        "); - out.println("
        \""
        "); + out.println("
        \""
        "); out.println("
          "); out.println("
        • " + rb.getString("(Stats) I read") + ": " + UserQueries.getStatsIRead(sql, user.UID) + "
          • "); out.println("
        • " + rb.getString("(Stats) My readers") + ": " + UserQueries.getStatsMyReaders(sql, user.UID) + "
          • "); @@ -322,7 +322,7 @@ public class PageTemplates { txt = formatMessage(txt); out.println("
        • "); - out.println("
          \""
          "); + out.println("
          \""
          "); out.println("
          " + formatDate(rs.getInt(8), rs.getString(9), locale) + "
          "); out.println("
          @" + uname + ":" + tags + "
          "); if (rs.getString(14) != null) { @@ -332,9 +332,9 @@ public class PageTemplates { if (rs.getString(12) != null) { if (rs.getString(12).equals("jpg")) { - out.println("
          \"\"/
          "); + out.println("
          \"\"/
          "); } else { - out.println("
          \"\"/
          "); + out.println("
          \"\"/
          "); } } diff --git a/src/java/com/juick/http/www/User.java b/src/java/com/juick/http/www/User.java index d2fef6e7..93656d0e 100644 --- a/src/java/com/juick/http/www/User.java +++ b/src/java/com/juick/http/www/User.java @@ -191,7 +191,7 @@ public class User { if (cnt % 3 == 0 && cnt > 0) { out.print(""); } - out.print("" + rs.getString(2) + ""); + out.print("" + rs.getString(2) + ""); cnt++; } } catch (SQLException e) { @@ -241,7 +241,7 @@ public class User { if (cnt % 3 == 0 && cnt > 0) { out.print(""); } - out.print("" + rs.getString(2) + ""); + out.print("" + rs.getString(2) + ""); cnt++; } } catch (SQLException e) { @@ -266,7 +266,7 @@ public class User { ResourceBundle rb = ResourceBundle.getBundle("User", locale); out.println("
          "); - out.println(" "); + out.println(" "); out.println("
          "); out.println("
            "); out.println("
          • " + rb.getString("(Menu) Blog") + "
            • "); diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java index d21060ab..2935ab2d 100644 --- a/src/java/com/juick/http/www/UserThread.java +++ b/src/java/com/juick/http/www/UserThread.java @@ -136,7 +136,7 @@ public class UserThread { out.println("
              "); out.println("
            • "); - out.println("
              \""
              "); + out.println("
              \""
              "); out.println("
              " + PageTemplates.formatDate(rs.getInt(8), rs.getString(9), locale) + "
              "); out.println("
              @" + uname + ":" + tags + "
              "); if (rs.getString(13) != null) { @@ -146,9 +146,9 @@ public class UserThread { if (rs.getString(11) != null) { if (rs.getString(11).equals("jpg")) { - out.println("
              \"\"/
              "); + out.println("
              \"\"/
              "); } else { - out.println("
              \"\"/
              "); + out.println("
              \"\"/
              "); } } @@ -275,12 +275,12 @@ public class UserThread { out.println("\">"); if (msg.AttachmentType != null) { if (msg.AttachmentType.equals("jpg")) { - out.println("
              \"\"/
              "); + out.println("
              \"\"/
              "); } else { - out.println("
              \"\"/
              "); + out.println("
              \"\"/
              "); } } - out.println("
              \""
              "); + out.println("
              \""
              "); out.println("
              " + PageTemplates.formatDate(msg.MinutesAgo, msg.TimestampString, locale) + "
              "); out.println("
              @" + msg.User.UName + ":
              "); out.println("
              " + msg.Text + "
              "); @@ -308,12 +308,12 @@ public class UserThread { out.print("
            • "); if (msg.AttachmentType != null) { if (msg.AttachmentType.equals("jpg")) { - out.println("
              \"\"/
              "); + out.println("
              \"\"/
              "); } else { - out.println("
              \"\"/
              "); + out.println("
              \"\"/
              "); } } - out.println("
              "); + out.println("
              "); out.println("
              " + PageTemplates.formatDate(msg.MinutesAgo, msg.TimestampString, locale) + "
              "); out.println("
              @" + msg.User.UName + ":
              "); out.println("
              " + msg.Text + "
              "); diff --git a/web/post3.js b/web/post3.js index 3267f9c0..756e1b20 100644 --- a/web/post3.js +++ b/web/post3.js @@ -35,7 +35,7 @@ function addTag(tag) { } function webcamShow() { - swfobject.embedSWF('http://juick.com/_webcam.swf','webcam','320','280','9.0.115','false',null,null,null); + swfobject.embedSWF('//juick.com/_webcam.swf','webcam','320','280','9.0.115','false',null,null,null); } function webcamImage(hash) { diff --git a/web/scripts3.js b/web/scripts3.js index 853734ed..c0de7757 100644 --- a/web/scripts3.js +++ b/web/scripts3.js @@ -1,14 +1,14 @@ function inlinevideo(mid) { var flashvars={ - file:'http://i.juick.com/video/'+mid+'.mp4', - image:'http://i.juick.com/thumbs/'+mid+'.jpg', - skin:'http://static.juick.com/glow.zip', + file:'//i.juick.com/video/'+mid+'.mp4', + image:'//i.juick.com/thumbs/'+mid+'.jpg', + skin:'//static.juick.com/glow.zip', autostart:'true' }; var params={ allowfullscreen:'true' }; - swfobject.embedSWF('http://static.juick.com/player.swf','video-'+mid,'512','384','9.0.115','false',flashvars,params,null); + swfobject.embedSWF('//static.juick.com/player.swf','video-'+mid,'512','384','9.0.115','false',flashvars,params,null); } function postformListener(formEl,ev) { -- cgit v1.2.3