/ - Diff - Andrej Cimperšek - diploma - Redmine

         </head>
         <body class="claro">
             <div id="wrap">
                 <h1>LIDAR Web Console</h1>
                 <h1>LIDAR Web Service</h1>
                 <hr/>
                 <div dojoType="dijit.layout.TabContainer" style="width: 100%;" doLayout="false">
                     <div dojoType="dijit.layout.ContentPane" title="Info" href="info.jsp" selected="true" closable="true"></div>
                     <!--<div dojoType="dijit.layout.ContentPane" title="Info" href="info.jsp" selected="true" closable="true"></div>-->
                     <div dojoType="dijit.layout.ContentPane" title="Status" href="status.jsp"></div>
                     <div dojoType="dojox.layout.ContentPane" title="API Key" href="apikey.jsp"></div>
                     <div dojoType="dijit.layout.ContentPane" title="Log" href="log.json" closable="true"></div>
                 </div>
-...
             <script type="text/javascript" src="dojo/dojo/dojo.js" djConfig="isDebug: true, parseOnLoad: true"></script>
             <script type="text/javascript" src="dojo/dijit/dijit.js"></script>
             <script type="text/javascript" src="dojo/dijit/dijit-all.js"></script>
             <script type="text/javascript">
                 dojo.require('dojox.layout.ContentPane');
             </script>
             <script type="text/javascript" src="js/main.js"></script>
         </body>
     </html>

trunk/web/apikey.jsp
	1	<%@page contentType="text/html" pageEncoding="UTF-8"%>
	2	<p>Za uporabo LIDAR naprave morate pridobiti API ključ. To lahko storite spodaj...</p>
	3	<hr/>
	4	<label for="key">API Key:</label> <input type="text" id="key" name="key" dojoType="dijit.form.TextBox" trim="true"/>
	5	<button dojoType="dijit.form.Button" type="button">Generate<script type="dojo/method" event="onClick" args="evt">
	6	dijit.byId("key").setValue("Thank you!");
	7	</script></button>

     %>
     Laser port: <strong><%= c.getString("devices.laser.port") %></strong><br/>
     Sensor port: <strong><%= c.getString("devices.sensor.port") %></strong><br/>
     Motion port: <strong><%= c.getString("devices.motion.port") %></strong><br/>
     Motion port: <strong><%= c.getString("devices.motion.port") %></strong><br/>
     <script type="text/javascript">
         alert('status');
     </script>

trunk/nbproject/project.properties
1	1	annotation.processing.enabled=true
2	2	annotation.processing.enabled.in.editor=true
3		annotation.processing.processors.list=
4	3	annotation.processing.run.all.processors=true
5	4	annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
6	5	build.classes.dir=${build.web.dir}/WEB-INF/classes

trunk/src/java/org/lidar/Position.java
5	5	* @author Andrej Cimpersek
6	6	*/
7	7	public class Position {
	8
8	9	public int position0;
9	10	public int position1;
10	11	}

      * @author Andrej Cimpersek
      */
     public class Config {
         private static XMLConfiguration configuration;
         public static XMLConfiguration getConfiguration(){
             if(configuration == null){
         public static XMLConfiguration getConfiguration() {
             if (configuration == null) {
                 try {
                     configuration = new XMLConfiguration("/etc/lidar/config.xml");
                     configuration.setAutoSave(true);
-...
             return configuration;
+        }
         public static void save(){
         public static void save() {
             try {
                 configuration.save("/etc/lidar/config.xml");
             } catch (Exception e) {

      * @author Andrej Cimpersek
      */
     public class AuthTokens implements Serializable {
         private Integer id;
         private String token;
         private Date access;
         private String ip;
         public AuthTokens(){
         public AuthTokens() {
+        }
         public AuthTokens(Integer id, String token, Date access, String ip){
         public AuthTokens(Integer id, String token, Date access, String ip) {
             this.id = id;
             this.token = token;
             this.access = access;

     import javax.persistence.*;
     /**
+     *
      * Client DB table
      * @author Andrej Cimpersek
      */
     @Entity
     @Table(name="client")
     @Table(name = "client")
     public class Client implements Serializable {
         private Integer id;
         private String apiKey;
         private String token;
         private String username;
         public Client(){
         public Client() {
+        }
         public Client(Integer id, String apiKey, String token){
         public Client(Integer id, String apiKey, String token) {
             this.id = id;
             this.apiKey = apiKey;
             this.token = token;
+        }
         @Id
         @GeneratedValue(strategy=GenerationType.AUTO)
         @GeneratedValue(strategy = GenerationType.AUTO)
         public Integer getId() {
             return this.id;
+        }
-...
             this.id = id;
+        }
         @Column(name="apikey")
         @Column(name = "apikey")
         public String getApiKey() {
             return this.apiKey;
+        }
-...
             this.token = token;
+        }
         public String getUsername() {
             return this.username;
+        }
         public void setUsername(String username) {
             this.username = username;
+        }
+    }

     /*
      * To change this template, choose Tools | Templates
      * and open the template in the editor.
      */
     package org.lidar;
     import com.google.gson.Gson;
-...
     import org.lidar.HibernateUtil;
     /**
+     *
      * Log Servlet
      * @author Andrej Cimpersek
      */
     public class LogServlet extends HttpServlet {
         /**
         /**
          * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
          * @param request servlet request
          * @param response servlet response
-...
          * @throws IOException if an I/O error occurs
          */
         protected void processRequest(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException {
                 throws ServletException, IOException {
             response.setContentType("application/json;charset=UTF-8");
             PrintWriter out = response.getWriter();
             Gson gson = new Gson();
             try {
                 int start = 0;
                 int limit = 15;
                 if(request.getParameter("limit") != null){
                 if (request.getParameter("limit") != null) {
                     limit = Integer.parseInt(request.getParameter("limit"));
+                }
                 if(request.getParameter("start") != null){
                 if (request.getParameter("start") != null) {
                     start = Integer.parseInt(request.getParameter("start"));
+                }
-...
                 Query query = session.createQuery("from Log as log order by log.date desc");
                 query.setFirstResult(start);
                 query.setMaxResults(limit);
                 JSONResponse resp = new JSONResponse(true, total, (ArrayList)query.list());
                 JSONResponse resp = new JSONResponse(true, total, (ArrayList) query.list());
                 out.write(gson.toJson(resp));
                 tx.commit();
             } catch (Exception e) {
-...
+        }
         class JSONResponse {
             private boolean success = true;
             private int total;
             private ArrayList rows;
             public JSONResponse(boolean success, int total, ArrayList rows){
             public JSONResponse(boolean success, int total, ArrayList rows) {
                 this.success = success;
                 this.total = total;
                 this.rows = rows;
-...
+        }
         // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
         /**
         /**
          * Handles the HTTP <code>GET</code> method.
          * @param request servlet request
          * @param response servlet response
-...
          */
         @Override
         protected void doGet(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException {
                 throws ServletException, IOException {
             processRequest(request, response);
+        }
+        }
         /**
         /**
          * Handles the HTTP <code>POST</code> method.
          * @param request servlet request
          * @param response servlet response
-...
          */
         @Override
         protected void doPost(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException {
                 throws ServletException, IOException {
             processRequest(request, response);
+        }
         /**
         /**
          * Returns a short description of the servlet.
          * @return a String containing servlet description
          */
-...
         public String getServletInfo() {
             return "Short description";
         }// </editor-fold>
+    }

      */
     @WebService()
     public class Management {
         private final Object lock = new Object();
         public static Boolean locked = false;
         public static String lockToken;
         public static Date lockAccess;
         @Resource
         private WebServiceContext wsContext;
-...
          * Web service operation
          */
         @WebMethod()
         public boolean getLockStatus(String authToken){
         public boolean getLockStatus(String authToken) {
             Client c = getClient(String.format("token = '%s'", authToken));
             if(c == null) return true;
             if (c == null) {
                 return true;
+            }
             return Management.locked;
+        }
-...
          * @param where
          * @return Client
          */
         private Client getClient(String where){
         private Client getClient(String where) {
             Client c = null;
             Session session = HibernateUtil.getSessionFactory().getCurrentSession();
             Transaction tx = null;
-...
                 tx = session.beginTransaction();
                 Query query = session.createQuery(String.format("from Client as client where %s", where));
                 c = (Client)query.list().get(0);
                 c = (Client) query.list().get(0);
                 tx.commit();
             } catch (Exception e) {
                 tx.rollback();
-...
          * @return null | authentication token
          */
         @WebMethod()
         public String getAuthenticationToken(String api_key, String username, String password){
         public String getAuthenticationToken(String api_key, String username, String password) {
             String token = null;
             MessageContext mc = wsContext.getMessageContext();
             Pam pam = new Pam();
             boolean auth = pam.authenticateSuccessful(username, password);
             if(auth){
             if (auth) {
                 Session session = HibernateUtil.getSessionFactory().getCurrentSession();
                 Transaction tx = null;
                 try {
-...
                     // TODO: generate new auth token and save it to DB
                     Client c = getClient(String.format("apikey = '%s'", api_key));
                     if(c != null){
                     if (c != null) {
                         token = c.getToken();
+                    }
                 } catch (Exception e) {
-...
+        }
         @WebMethod()
         public String getLockToken(String authToken){
             synchronized(lock){
         public String getLockToken(String authToken) {
             synchronized (lock) {
                 Client c = getClient(String.format("token = '%s'", authToken));
                 if(Management.locked || c == null) return null;
                 if (Management.locked || c == null) {
                     return null;
+                }
                 Management.locked = true;
                 Management.lockToken = authToken; // TODO: generate token
                 Management.lockAccess = new Date();
+            }
             return Management.lockToken;
+        }
         @WebMethod
         public boolean unlock(String lockToken){
             synchronized(lock){
                 if(!Management.locked || !Management.lockToken.equals(lockToken)) return false;
         public boolean unlock(String lockToken) {
             synchronized (lock) {
                 if (!Management.locked || !Management.lockToken.equals(lockToken)) {
                     return false;
+                }
                 Management.locked = false;
                 Management.lockToken = null;
+            }
             return true;
+        }
+    }

     @WebService()
     public class Motion extends Serial {
         public Motion(){
         public Motion() {
             super("motion");
             openPort();
+        }
-...
          * @param freq
          */
         @WebMethod()
         public void setMove0(int steps, float freq){
+    	}
         public void setMove0(int steps, float freq) {
+        }
         /**
          * Sets parameters for next motor move
-...
          * @param freq
          */
         @WebMethod()
         public void setMove1(int steps, float freq){
         public void setMove1(int steps, float freq) {
+        }
+    	}
         /**
          * Moves motors according to set moves
          */
         @WebMethod()
         public void run(){
         public void run() {
+        }
+    	}
         /**
          * Sets angular velocity in steps / sec
          * @param omega0
          */
         @WebMethod()
         public void setInitialAngularVel0(float omega0){
         public void setInitialAngularVel0(float omega0) {
+        }
+    	}
         /**
          * Sets angular velocity in steps / sec
          * @param omega0
          */
         @WebMethod()
         public void setInitialAngularVel1(float omega0){
         public void setInitialAngularVel1(float omega0) {
+        }
+    	}
         /**
          * Sets angular acceleration in steps / sec^2
          * @param accel
          */
         @WebMethod()
         public void setAngularAcceleration0(float accel){
         public void setAngularAcceleration0(float accel) {
+        }
+    	}
         /**
          * Sets angular acceleration in steps / sec^2
          * @param accel
          */
         @WebMethod()
         public void setAngularAcceleration1(float accel){
         public void setAngularAcceleration1(float accel) {
+        }
+    	}
         /**
+         *
          * @param steps
          */
         @WebMethod()
         public void setLackCorrection0(short steps){
         public void setLackCorrection0(short steps) {
+        }
+    	}
         /**
+         *
          * @param steps
          */
         @WebMethod()
         public void setLackCorrection1(short steps){
         public void setLackCorrection1(short steps) {
+        }
+    	}
         /**
          * Sets angular deceleration in steps / sec^2
          * @param decel
          */
         @WebMethod()
         public void setAngularDeceleration0(float decel){
         public void setAngularDeceleration0(float decel) {
+        }
+    	}
         /**
          * Sets angular deceleration in steps / sec^2
          * @param decel
          */
         @WebMethod()
         public void setAngularDeceleration1(float decel){
         public void setAngularDeceleration1(float decel) {
+        }
+    	}
         /**
          * Sets position for stepper 0
          * @param position
          */
         @WebMethod()
         public void setPosition0(int position){
         public void setPosition0(int position) {
+        }
+    	}
         /**
          * Sets position for stepper 1
          * @param position
          */
         @WebMethod()
         public void setPosition1(int position){
         public void setPosition1(int position) {
+        }
+    	}
         /**
          * Stops motor 0
          */
         @WebMethod()
         public void stopMotor0(){
         public void stopMotor0() {
+        }
+    	}
         /**
          * Stops motor 1
          */
         @WebMethod()
         public void stopMotor1(){
         public void stopMotor1() {
+        }
+    	}
         /**
          * Disables current on motor 0
          */
         @WebMethod()
         public void setMotorOff0(){
         public void setMotorOff0() {
+        }
+    	}
         /**
          * Disables current on motor 1
          */
         @WebMethod()
         public void setMotorOff1(){
         public void setMotorOff1() {
+        }
+    	}
         /**
          * Gets positions of both motors
          * @return Position
          */
         @WebMethod()
         public Position getPosition(){
         public Position getPosition() {
             return new Position();
+    	}
+        }
         /**
          * Set continuous key movement
          */
         @WebMethod()
         public void setContinuousKeyMovement(){
         public void setContinuousKeyMovement() {
+        }
+    	}
         /**
          * Set single step key movement
          */
         @WebMethod()
         public void setSingleStepKeyMovement(){
         public void setSingleStepKeyMovement() {
+        }
+    	}
         /**
          * Simulate Left Key Press
          */
         @WebMethod()
         public void simulateLeftKeyPress(){
         public void simulateLeftKeyPress() {
+        }
+    	}
         /**
          * Simulate Left Key Release
          */
         @WebMethod()
         public void simulateLeftKeyRelease(){
         public void simulateLeftKeyRelease() {
+        }
+    	}
         /**
          * Simulate Right Key Press
          */
         @WebMethod()
         public void simulateRightKeyPress(){
         public void simulateRightKeyPress() {
+        }
+    	}
         /**
          * Simulate Right Key Release
          */
         @WebMethod()
         public void simulateRightKeyRelease(){
         public void simulateRightKeyRelease() {
+        }
+    	}
         /**
          * Simulate Up Key Press
          */
         @WebMethod()
         public void simulateUpKeyPress(){
         public void simulateUpKeyPress() {
+        }
+    	}
         /**
          * Simulate Up Key Release
          */
         @WebMethod()
         public void simulateUpKeyRelease(){
         public void simulateUpKeyRelease() {
+        }
+    	}
         /**
          * Simulate Down Key Press
          */
         @WebMethod()
         public void simulateDownKeyPress(){
         public void simulateDownKeyPress() {
+        }
+    	}
         /**
          * Simulate Down Key Release
          */
         @WebMethod()
         public void simulateDownKeyRelease(){
         public void simulateDownKeyRelease() {
+        }
+    	}
         /**
          * Sets automatic position reporting.
          * 0..turns off automatic position reporting, 50..9999 autoreport interval in milliseconds
          * @param interval
          */
         @WebMethod()
         public void setAutomaticPositionReporting(short interval){
+    	}
         public void setAutomaticPositionReporting(short interval) {
+        }
+    }

      */
     @WebService()
     public class Laser extends Serial {
         public Laser(){
         public Laser() {
             super("laser");
             openPort();
+        }
-...
          * Vkljuci laser, ki zacne delovati v skladu z nastavljenimi parametri.
          */
         @WebMethod()
         public boolean fire(String lockToken){
         public boolean fire(String lockToken) {
             return sendCommand(lockToken, "$FIRE 01\r");
+        }
-...
          * Izkljuci laser.
          */
         @WebMethod()
         public boolean stop(String lockToken){
         public boolean stop(String lockToken) {
             return sendCommand(lockToken, "$STOP 00\r");
+    	}
+        }
         /**
          * Shrani trenutno konfiguracijo parametrov v interni pomnilnik laserja, ki se bodo nalozili ob naslednjem zagonu napajanja.
          */
         @WebMethod()
         public boolean saveConfig(String lockToken){
         public boolean saveConfig(String lockToken) {
             return sendCommand(lockToken, "$SAVE 01\r");
+    	}
+        }
         /**
          * Mnozica vseh nacinov delovanja laserja.
          */
         public enum LaserMode { Continuous, Burst, ExternalTrigger};
         public enum LaserMode {
             Continuous, Burst, ExternalTrigger
         };
         /**
          * Izbere nacin delovanja laserja. Nacini mode so nasteti v mnozici LaserMode.
          * @param mode Nacin delovanja laserja.
          */
         @WebMethod()
         public boolean setMode(String lockToken, LaserMode mode){
             switch(mode){
         public boolean setMode(String lockToken, LaserMode mode) {
             switch (mode) {
                 case Continuous:
                     return sendCommand(lockToken, "$MODE 01\r");
                 case Burst:
-...
+            }
             return false;
+    	}
+        }
         /**
          * Omogoci oz. onemogoci Q-Switch opcijo.
          * @param enabled Omogoci oz. onemogoci..
          */
         @WebMethod()
         public boolean setQSwitch(String lockToken, boolean enabled){
             if(enabled){
         public boolean setQSwitch(String lockToken, boolean enabled) {
             if (enabled) {
                 return sendCommand(lockToken, "$QSWITCH 01\r");
             } else {
                 return sendCommand(lockToken, "$QSWITCH 00\r");
+            }
+    	}
+        }
         /**
          * Zaklene oz. odklene tipkovnico na napajalniku laserja.
          * @param locked Zaklep oz. odklep.
          */
         @WebMethod()
         public boolean setKeypad(String lockToken, boolean enabled){
             if(enabled){
         public boolean setKeypad(String lockToken, boolean enabled) {
             if (enabled) {
                 return sendCommand(lockToken, "$KEYPAD 01\r");
             } else {
                 return sendCommand(lockToken, "$KEYPAD 00\r");
+            }
+    	}
+        }
         /**
          * Nastavi stevilo sunkov laserja, pulses, ki se bodo zaporedoma izbvrsili, ce je izbran nacin delovanje LaserMode.Continuous.
-...
          * @param pulses Stevilo sunkov laserja.
          */
         @WebMethod()
         public boolean setBurstPulseCount(String lockToken, byte pulses){
             if(pulses < 0 && pulses > 99){
         public boolean setBurstPulseCount(String lockToken, byte pulses) {
             if (pulses < 0 && pulses > 99) {
                 return false;
+            }
             String p = "" + pulses;
             if (p.length() == 1) p = "0" + p;
             if (p.length() == 1) {
                 p = "0" + p;
+            }
             return sendCommand(lockToken, "$BURST " + p + "\r");
+    	}
+        }
         /**
          * Zazene Q-Switch na vsakih freq sunkov.
-...
          * @param freq Frekvenca sunkov.
          */
         @WebMethod()
         public boolean setQSwitchFrequency(String lockToken, byte freq){
             if(freq < 0 && freq > 99){
         public boolean setQSwitchFrequency(String lockToken, byte freq) {
             if (freq < 0 && freq > 99) {
                 return false;
+            }
             String f = "" + freq;
             if (f.length() == 1) f = "0" + f;
             if (f.length() == 1) {
                 f = "0" + f;
+            }
             return sendCommand(lockToken, "$QFREQ " + f + "\r");
+    	}
+        }
         /**
          * Zakasnitev aktivacije v stevilu sunkov delay.
          * Dovoljeno obmocje je od 0 - 99.
          * @param delay Zakasnitev aktivacije.
          */
         public boolean setQSwitchDelay(String lockToken, byte delay){
             if(delay < 0 && delay > 99){
         public boolean setQSwitchDelay(String lockToken, byte delay) {
             if (delay < 0 && delay > 99) {
                 return false;
+            }
             String d = "" + delay;
             if (d.length() == 1) d = "0" + d;
             if (d.length() == 1) {
                 d = "0" + d;
+            }
             return sendCommand(lockToken, "$QDLY " + d + "\r");
+    	}
+        }
         /**
          * Nastavi energijo laserja, eneryLevel, pri posameznem sunku aktivcaije.
          * @param energyLevel Energija laserja.
          */
         @WebMethod()
         public boolean setEnergyLevel(String lockToken, byte energyLevel){
             if(energyLevel < 1 && energyLevel > 20){
         public boolean setEnergyLevel(String lockToken, byte energyLevel) {
             if (energyLevel < 1 && energyLevel > 20) {
                 return false;
+            }
             String e = "" + energyLevel;
             if (e.length() == 1) e = "0" + e;
             if (e.length() == 1) {
                 e = "0" + e;
+            }
             return sendCommand(lockToken, "$EPFN " + e + "\r");
+    	}
+        }
         /**
          * Nastavi frekvenco, s katero naj se prozi lase po aktivaciji. Frekvenca je izrazena v sunkih na sekundo, rate.
-...
          * @param rate Frekvenca s katero se prozi laser.
          */
         @WebMethod()
         public boolean setRepetitionRate(String lockToken, byte rate){
             if (rate == 1 || rate == 2 || rate == 5 || rate == 10 || rate == 20){
         public boolean setRepetitionRate(String lockToken, byte rate) {
             if (rate == 1 || rate == 2 || rate == 5 || rate == 10 || rate == 20) {
                 String r = "" + rate;
                 if (r.length() == 1) r = "0" + r;
                 if (r.length() == 1) {
                     r = "0" + r;
+                }
                 return sendCommand(lockToken, "$LPRF " + r + "\r");
+            }
             return false;
+    	}
+        }
+    }

      */
     @WebService()
     public class Video {
         /**
          * Returns image
          * @return byte[] PNG image
          */
         @WebMethod()
         public byte[] getImage(String lockToken){
         public byte[] getImage(String lockToken) {
             try {
                 return Util.GetBytesFromFile(new File("capture.png"));
             } catch (Exception e) {
                 return null;
+            }
+        }
+    }
+    }

     @WebService()
     public class Sensor extends Serial {
         public Sensor(){
         public Sensor() {
             super("sensor");
             openPort();
+        }
-...
          * Kaj natancno naredi ukaz ni znano. Pred zajemom podatkov ga je potrebno izvesti.
          * TODO: odstranit oz. samodejen klic pred zajemom podatkov.
          */
         private void readQuery(){
         private void readQuery() {
+        }
+    	}
         /**
          * Pripravi senzor na zajemanje podatkov. Ob naslednjih prozenjih laserja bodo meritve dostopne preko lastnosti ReceivedMeasurement.
          * TODO: drugačen dostop do podatkov
          */
         @WebMethod()
         public void runAcqusition(){
         public void runAcqusition() {
             // TODO: preveri ce je ok
             readQuery();
+    	}
+        }
         /**
          * Ustavi zajemanje podatkov ob prozenju laserja. Z drugimi besadami, ob naslednjih sprozitvah laserja ne bomo dobili podatkov meritev.
          */
         @WebMethod()
         public void stopAcqusition(){
         public void stopAcqusition() {
+        }
+    	}
         /**
          * Podobno kot RunAcqusition, natancnejsi podatki zal niso znani.
          */
         @WebMethod()
         public void forceTrigger(){
         public void forceTrigger() {
+        }
+    	}
         /**
          * Mnozica doloca vse mozne tipe meritev.
          */
         public enum DataType { Data, Background, DataMinusBackground }
         public enum DataType {
             Data, Background, DataMinusBackground
+        }
         /**
          * Nastavi tip type meritve.
          * @param type Tip meritve.
          */
         @WebMethod()
         public void setDataType(DataType type){
         public void setDataType(DataType type) {
+        }
+    	}
         /**
          * Vrne status senzurja, predstavljen v enem byte-u.
          * @return byte Status senzorja.
          */
         @WebMethod()
         public byte getStatus(){
             return (byte)'0';
+    	}
         public byte getStatus() {
             return (byte) '0';
+        }
         /**
          * Poslje gain profil gainData v senzor.
          * @param gainData Gain profil.
          */
         @WebMethod()
         public void sendGain(short[] gainData){
+    	}
         public void sendGain(short[] gainData) {
+        }
+    }

      * @author Andrej Cimpersek
      */
     public class Util {
         public static byte CalcXOR(byte[] data, int offset, int count)
+        {
         public static byte CalcXOR(byte[] data, int offset, int count) {
             byte x = data[offset];
             for (int i = 1; i < count; i++) x ^= data[offset + i];
             for (int i = 1; i < count; i++) {
                 x ^= data[offset + i];
+            }
             return x;
+        }
         private static byte CalcXOR(String data)
+        {
             byte x = (byte)(data.charAt(0));
             for (int i = 1; i < data.length(); i++) x ^= (byte)(data.charAt(i));
         private static byte CalcXOR(String data) {
             byte x = (byte) (data.charAt(0));
             for (int i = 1; i < data.length(); i++) {
                 x ^= (byte) (data.charAt(i));
+            }
             return x;
+        }
-...
+            }
             // Create the byte array to hold the data
             byte[] bytes = new byte[(int)length];
             byte[] bytes = new byte[(int) length];
             // Read in the bytes
             int offset = 0;
             int numRead = 0;
             while (offset < bytes.length
                    && (numRead=is.read(bytes, offset, bytes.length-offset)) >= 0) {
                     && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) {
                 offset += numRead;
+            }
             // Ensure all the bytes have been read in
             if (offset < bytes.length) {
                 throw new IOException("Could not completely read file "+file.getName());
                 throw new IOException("Could not completely read file " + file.getName());
+            }
             // Close the input stream and return bytes

+     *
      * @author Andrej Cimpersek
      */
     public class HibernateUtil {
     public class HibernateUtil {
       private static final SessionFactory sessionFactory;
       static {
         try {
           // Create the SessionFactory from hibernate.cfg.xml
           sessionFactory = new AnnotationConfiguration().configure().buildSessionFactory();
         } catch (Throwable ex) {
           // Make sure you log the exception, as it might be swallowed
           System.err.println("Initial SessionFactory creation failed." + ex);
           throw new ExceptionInInitializerError(ex);
         private static final SessionFactory sessionFactory;
         static {
             try {
                 // Create the SessionFactory from hibernate.cfg.xml
                 sessionFactory = new AnnotationConfiguration().configure().buildSessionFactory();
             } catch (Throwable ex) {
                 // Make sure you log the exception, as it might be swallowed
                 System.err.println("Initial SessionFactory creation failed." + ex);
                 throw new ExceptionInInitializerError(ex);
+            }
+        }
+      }
       public static SessionFactory getSessionFactory() {
         return sessionFactory;
+      }
+    }
         public static SessionFactory getSessionFactory() {
             return sessionFactory;
+        }
+    }

      * @author Andrej Cimpersek
      */
     public class Serial {
         private boolean isOpened = false;
         private String deviceName;
         private String portName;
-...
         protected OutputStream outputStream;
         private int baudRate, dataBits, stopBits, parity;
         private XMLConfiguration configuration;
         public Serial(String deviceName){
         public Serial(String deviceName) {
             configuration = Config.getConfiguration();
             this.portName = configuration.getString(String.format("devices.%s.port", deviceName));
             this.baudRate = configuration.getInt(String.format("devices.%s.baudRate", deviceName));
-...
          *   (b) matches the desired name.
          * @return boolean
          */
         protected boolean identfy(){
         protected boolean identfy() {
             this.portIdentifiers = CommPortIdentifier.getPortIdentifiers();
             this.portId = null;  // will be set if port found
             while (portIdentifiers.hasMoreElements())
+            {
                 CommPortIdentifier pid = (CommPortIdentifier)portIdentifiers.nextElement();
                 if(pid.getPortType() == CommPortIdentifier.PORT_SERIAL && pid.getName().equals(this.portName)){
             while (portIdentifiers.hasMoreElements()) {
                 CommPortIdentifier pid = (CommPortIdentifier) portIdentifiers.nextElement();
                 if (pid.getPortType() == CommPortIdentifier.PORT_SERIAL && pid.getName().equals(this.portName)) {
                     this.portId = pid;
                     return true;
+                }
-...
          * Destructor - close port
          */
         @Override()
         protected void finalize() throws Throwable{
         protected void finalize() throws Throwable {
             closePort();
+        }
         public boolean acquirePort(){
             if(this.portId == null) return false;
         public boolean acquirePort() {
             if (this.portId == null) {
                 return false;
+            }
             // Use port identifier for acquiring the port
             try {
                 this.port = (SerialPort)this.portId.open(
                     this.deviceName, // Name of the application asking for the port
 // Wait max. 10 sec. to acquire port
                 );
             } catch(PortInUseException e) {
                 this.port = (SerialPort) this.portId.open(
                         this.deviceName, // Name of the application asking for the port
 // Wait max. 10 sec. to acquire port
                         );
             } catch (PortInUseException e) {
                 return false;
+            }
             return true;
+        }
         public boolean openPort(){
             if(!acquirePort()) return false;
         public boolean openPort() {
             if (!acquirePort()) {
                 return false;
+            }
             closePort();
             try {
                 this.port.setSerialPortParams(this.baudRate, this.dataBits, this.stopBits, this.parity);
                 this.port.removeEventListener();
                 this.port.addEventListener(new SerialPortEventListener() {
                     public void serialEvent(SerialPortEvent event){
                         switch(event.getEventType()) {
                     public void serialEvent(SerialPortEvent event) {
                         switch (event.getEventType()) {
                             case SerialPortEvent.OUTPUT_BUFFER_EMPTY:
                                 onOutputBufferEmpty(event);
                                 break;
-...
+            }
+        }
         public void closePort(){
             if(this.port == null) return;
         public void closePort() {
             if (this.port == null) {
                 return;
+            }
             try {
                 this.inputStream.close();
                 this.outputStream.close();
-...
         /**
          * Write shortcut for string
          */
         public boolean sendCommand(String lockToken, String string){
         public boolean sendCommand(String lockToken, String string) {
             return sendCommand(lockToken, string.getBytes());
+        }
-...
          * @param bytes
          * @return boolean
          */

Project

General

Profile

Andrej Cimperšek - diploma

Revision 11