Index: trunk/docs/conf.py
===================================================================
--- trunk/docs/conf.py	(revision 10)
+++ trunk/docs/conf.py	(revision 11)
@@ -138,10 +138,10 @@
 #html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_use_modindex = True
+html_use_modindex = False
 
 # If false, no index is generated.
-#html_use_index = True
+html_use_index = False
 
 # If true, the index is split into individual pages for each letter.
 #html_split_index = False
Index: trunk/docs/_build/html/search.html
===================================================================
--- trunk/docs/_build/html/search.html	(revision 10)
+++ trunk/docs/_build/html/search.html	(revision 11)
@@ -34,9 +34,6 @@
     <div class="related">
       <h3>Navigacija</h3>
       <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             accesskey="I">abecedni seznam</a></li>
         <li><a href="index.html">LIDAR dokumentacija</a> &raquo;</li> 
       </ul>
     </div>  
@@ -82,9 +79,6 @@
     <div class="related">
       <h3>Navigacija</h3>
       <ul>
-        <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             >abecedni seznam</a></li>
         <li><a href="index.html">LIDAR dokumentacija</a> &raquo;</li> 
       </ul>
     </div>
Index: trunk/docs/_build/html/searchindex.js
===================================================================
--- trunk/docs/_build/html/searchindex.js	(revision 10)
+++ trunk/docs/_build/html/searchindex.js	(revision 11)
@@ -1 +1 @@
-Search.setIndex({objects:{},terms:{opomba:[],pritrdili:3,code:[],uporabnikom:3,ali:[0,2,3],"onesna\u017eevalcev":[0,2,3],text:[],razviti:3,uporabimo:[0,2,3],"onesna\u017eevanja":[0,2,3],harrisov:3,nadozrni:1,gradientov:3,zaklenjen:1,delcev:[0,2,3],programska:3,gibanj:3,sudo:1,vklju:[],namestimo:1,web:[1,3],postopka:3,fotodiod:3,zajemanj:3,delujo:[],motorjev:3,api_kei:1,indeksi:[],cime:[],ske:[],valov:[0,2,3],abecedni:[],izra:[],teleskopa:3,cun:[],pozicioniranj:3,merjenj:[0,2,3],laserja:3,prilagoditev:3,luki:[0,2,3],neposredn:3,python:1,cem:[],getlocktoken:1,"polprevodni\u0161k":3,auth:1,izdelanih:3,opremo:3,natan:[],prostorsko:3,dostop:1,cno:[],postan:3,prikazovalnika:3,cuje:[],opi:[4,3],"namre\u010d":[0,2,3],bazo:3,okolju:3,cilji:[4,3],"kora\u010dnih":3,kontrol:3,kalibracijsk:3,zaklep:1,list:[],podatkov:3,item:[],"ra\u010dunalni\u0161ki":3,getstatu:1,"ra\u010dunalni\u0161ko":3,nadaljno:3,modulov:[],podstavek:3,razvojnemu:3,protokol:3,metod:[4,3],iskanj:3,webservice_host:1,mobilni:3,dokumentacija:4,right:[],nadzor:3,uporaben:3,auth_token:1,some:[],"grafi\u010dnega":3,ransac:3,radijskih:[0,2,3],hitachi:3,pojavov:[0,2,3],authent:[],mikrokrmilnika:3,arhitektura:[4,0],ter:3,obvezno:3,bold:[],poleg:3,analizo:3,statu:1,sud:1,namesto:[0,2,3],sestavljata:3,"pomo\u010djo":3,space:[],token:1,tvori:[0,2,3],smo:3,ritm:3,algoritem:3,zaznavanj:[0,2,3],print:1,vsebina:4,microchip:3,bla:[],localhost:[],shranjevanj:3,med:3,"prete\u017eno":[0,2,3],skrbi:1,lidarskega:3,uporabo:1,mwd40:[],iskalnik:[],getauthenticationtoken:1,njihov:3,korespondenc:3,uporab:1,here:[],ubuntu:1,algoritmi:3,wsdl:1,"razli\u010dnih":[0,2,3],uporabljajo:3,prikaz:3,svetlobnih:3,cilnih:[],zraku:[0,2,3],dveh:3,manag:1,osebnega:3,vremenskih:[0,2,3],algo:3,ski:[],interaktivnega:3,"zna\u010dilnih":3,rang:[],interaktivni:3,vid:3,tabela:3,namen:3,modul:[1,3,4],znost:[],easy_instal:1,odklenjena:1,header:[],servisa:1,api:[4,2],obstajala:3,sunkovnega:3,merjenja:3,"import":1,komunikacijsk:3,opisniki:3,novo:3,uporabniku:3,detektor:3,komercialnega:3,from:1,razvoj:3,tabel:[],uporabljamo:3,seznam:[],lidar:[0,1,2,3,4],"grafi\u010dnih":3,prijavljen:1,premikanj:3,yag:3,modula:3,stopnjo:[0,2,3],tipkovnic:3,cnega:[],slikami:3,"izra\u010dun":3,"vklju\u010duj":3,programirati:3,oprema:3,"ra\u010dunalnika":3,podporo:3,izdelava:3,vgradnja:3,cnamenskega:[],programsko:3,cnih:[],nadzorni:[1,4],pomo:[],sko:[],kompatibilnega:3,avtentikacija:1,none:1,odklep:1,enostavn:3,avtomatizaciji:3,cunalni:[],servic:1,ltriranj:3,unlock:1,koda:[],dano:3,uporablja:[0,2,3],kameri:3,skupaj:[0,2,3],kvantitativno:[0,2,3],uporaba:[1,3,4],lokalnih:3,uporablj:[0,2,3],modernemu:3,vgrajen:3,sunkov:3,polprevodni:[],interaktivno:3,"o\u010dem":3,pripomogli:3,lock:1,orientacijo:3,pic:3,slik:3,prijaznega:3,lahko:[0,2,3],naprava:[1,2,3,0],"to\u010dk":3,algoritm:3,"mo\u017enost":3,nekaj:3,need:[],tam:[0,2,3],vgradni:3,lidar_servic:[],rezultati:[4,3],inc:3,izdelati:3,zasnovati:3,password:1,fedorahost:[],cjo:[],podpornimi:[0,2,3],naj:3,todo:1,krmiljenja:3,"ve\u010dnamenskega":3,note:[],gaussovo:3,naprav:1,gra:[],sistem:[0,2,3],programiranega:3,soap:1,cunalnika:[],http:1,kot:3,obstaja:[0,2,3],usernam:1,ital:[],interakcij:3,after:[],kora:[],zrcalnega:3,"\u017eelja":[0,2,3],"natan\u010dno":3,ovrednoti:[0,2,3],varen:3,koper:[0,2,3],sistema:3,elementi:[0,2,3],lidarja:3,prek:3,org:[],zaklenjena:1,zna:[],lock_token:1,bullet:[],izvor:3,url:1,vmesnika:3,podobna:[0,2,3],vgrajenih:3,indeksna:3,temelji:3,radarju:[0,2,3],lidarski:[0,2,3],svetlobo:[0,2,3],client:1,thi:[],"delujo\u010d":3,primeri:1,standardnega:3,"knji\u017eico":1},objtypes:{},titles:["Arhitektura","Uporaba","API","Opis","LIDAR dokumentacija"],objnames:{},filenames:["arhitektura","uporaba","api","opis","index"]})
\ No newline at end of file
+Search.setIndex({objects:{},terms:{opomba:[],pritrdili:3,code:[],uporabnikom:3,ali:[0,1,3],"onesna\u017eevalcev":[0,1,3],text:[],razviti:3,uporabimo:[0,1,3],"onesna\u017eevanja":[0,1,3],harrisov:3,nadozrni:4,gradientov:3,zaklenjen:4,delcev:[0,1,3],nadzorni:[4,2],gibanj:3,vklju:[],namestimo:4,web:[4,3],postopka:3,vid:3,zajemanj:3,delujo:[],motorjev:3,api_kei:4,indeksi:[],ske:[],valov:[0,1,3],abecedni:[],izra:[],teleskopa:3,cun:[],pozicioniranj:3,merjenj:[0,1,3],laserja:3,cunalni:[],prilagoditev:3,luki:[0,1,3],neposredn:3,python:4,cem:[],gra:[],getlocktoken:4,"polprevodni\u0161k":3,auth:4,izdelanih:3,opremo:3,natan:[],dostop:4,vsebina:2,postan:3,prikazovalnika:3,cuje:[],opi:[2,3],"namre\u010d":[0,1,3],bazo:3,podobna:[0,1,3],okolju:3,avtomatizaciji:3,cilji:[2,3],"kora\u010dnih":3,kontrol:3,metod:[2,3],zaklep:4,list:[],bullet:[],podatkov:3,item:[],"ra\u010dunalni\u0161ki":3,getstatu:4,"ra\u010dunalni\u0161ko":3,nadaljno:3,modulov:[],podstavek:3,shranjevanj:3,protokol:3,kalibracijsk:3,iskanj:3,webservice_host:4,mobilni:3,dokumentacija:2,right:[],nadzor:3,uporaben:3,auth_token:4,some:[],"grafi\u010dnega":3,radijskih:[0,1,3],hitachi:3,pojavov:[0,1,3],authent:[],mikrokrmilnika:3,arhitektura:[0,2],ter:3,obvezno:3,osebnega:3,"prete\u017eno":[0,1,3],poleg:3,analizo:3,statu:4,sud:4,namesto:[0,1,3],sestavljata:3,"pomo\u010djo":3,space:[],token:4,tvori:[0,1,3],smo:3,ritm:3,algoritem:3,zaznavanj:[0,1,3],print:4,cno:[],microchip:3,bla:[],novo:3,localhost:[],razvojnemu:3,med:3,sko:[],bold:[],skrbi:4,lidarskega:3,kvantitativno:[0,1,3],mwd40:[],iskalnik:[],getauthenticationtoken:4,njihov:3,korespondenc:3,here:[],ubuntu:4,algoritmi:3,wsdl:4,lock:4,uporabljajo:3,prikaz:3,svetlobnih:3,cilnih:[],zraku:[0,1,3],dveh:3,manag:4,zasnovati:3,vremenskih:[0,1,3],algo:3,interaktivnega:3,"zna\u010dilnih":3,rang:[],fotodiod:3,namen:3,modul:[4,3,2],znost:[],easy_instal:4,odklenjena:4,header:[],servisa:4,api:[2,1],sunkovnega:3,merjenja:3,"import":4,indeksna:3,lidarja:3,ransac:3,uporabniku:3,detektor:3,komercialnega:3,from:4,razvoj:3,tabel:[],uporabljamo:3,seznam:[],lidar:[0,1,2,3,4],"grafi\u010dnih":3,thi:[],prijavljen:4,premikanj:3,yag:3,modula:3,stopnjo:[0,1,3],sunkov:3,cnega:[],lahko:[0,1,3],pic:3,"izra\u010dun":3,"vklju\u010duj":3,programirati:3,oprema:3,"ra\u010dunalnika":3,podporo:3,izdelava:3,vgradnja:3,cnamenskega:[],programsko:3,cnih:[],programska:3,pomo:[],prostorsko:3,kompatibilnega:3,avtentikacija:4,none:4,odklep:4,enostavn:3,slikami:3,ski:[],servic:4,ltriranj:3,unlock:4,"knji\u017eico":4,koda:[],dano:3,uporablja:[0,1,3],kameri:3,skupaj:[0,1,3],uporabo:4,uporaba:[4,3,2],lokalnih:3,uporablj:[0,1,3],modernemu:3,vgrajen:3,tabela:3,polprevodni:[],nekaj:3,"o\u010dem":3,pripomogli:3,obstajala:3,orientacijo:3,sudo:4,slik:3,prijaznega:3,interaktivni:3,naprava:[0,1,3,4],"to\u010dk":3,algoritm:3,"mo\u017enost":3,interaktivno:3,need:[],tam:[0,1,3],vgradni:3,lidar_servic:[],rezultati:[2,3],inc:3,izdelati:3,komunikacijsk:3,password:4,fedorahost:[],cjo:[],podpornimi:[0,1,3],naj:3,todo:4,krmiljenja:3,client:4,note:[],gaussovo:3,naprav:4,tipkovnic:3,sistem:[0,1,3],programiranega:3,soap:4,cunalnika:[],http:4,kot:3,obstaja:[0,1,3],usernam:4,ital:[],interakcij:3,after:[],kora:[],"\u017eelja":[0,1,3],"natan\u010dno":3,ovrednoti:[0,1,3],varen:3,koper:[0,1,3],sistema:3,elementi:[0,1,3],opisniki:3,org:[],zaklenjena:4,zna:[],lock_token:4,cime:[],izvor:3,url:4,standardnega:3,prek:3,vgrajenih:3,"ve\u010dnamenskega":3,temelji:3,radarju:[0,1,3],lidarski:[0,1,3],svetlobo:[0,1,3],uporab:4,zrcalnega:3,"delujo\u010d":3,primeri:4,vmesnika:3,"razli\u010dnih":[0,1,3]},objtypes:{},titles:["Arhitektura","API","LIDAR dokumentacija","Opis","Uporaba"],objnames:{},filenames:["arhitektura","api","index","opis","uporaba"]})
\ No newline at end of file
Index: trunk/docs/_build/html/.buildinfo
===================================================================
--- trunk/docs/_build/html/.buildinfo	(revision 10)
+++ trunk/docs/_build/html/.buildinfo	(revision 11)
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 310957323a9fa976fa94d2a1418bd040
+config: 18f1ef41b827f0fee7f6cdecdab9d4a7
 tags: fbb0d17656682115ca4d033fb2f83ba1
Index: trunk/docs/_build/html/index.html
===================================================================
--- trunk/docs/_build/html/index.html	(revision 10)
+++ trunk/docs/_build/html/index.html	(revision 11)
@@ -30,11 +30,8 @@
       <h3>Navigacija</h3>
       <ul>
         <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             accesskey="I">abecedni seznam</a></li>
-        <li class="right" >
           <a href="opis.html" title="Opis"
-             accesskey="N">naprej</a> |</li>
+             accesskey="N">naprej</a></li>
         <li><a href="#">LIDAR dokumentacija</a> &raquo;</li> 
       </ul>
     </div>  
@@ -95,11 +92,8 @@
       <h3>Navigacija</h3>
       <ul>
         <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             >abecedni seznam</a></li>
-        <li class="right" >
           <a href="opis.html" title="Opis"
-             >naprej</a> |</li>
+             >naprej</a></li>
         <li><a href="#">LIDAR dokumentacija</a> &raquo;</li> 
       </ul>
     </div>
Index: trunk/docs/_build/html/api.html
===================================================================
--- trunk/docs/_build/html/api.html	(revision 10)
+++ trunk/docs/_build/html/api.html	(revision 11)
@@ -23,6 +23,7 @@
     <script type="text/javascript" src="_static/doctools.js"></script>
     <script type="text/javascript" src="_static/translations.js"></script>
     <link rel="top" title="LIDAR dokumentacija" href="index.html" />
+    <link rel="next" title="Uporaba" href="uporaba.html" />
     <link rel="prev" title="Arhitektura" href="arhitektura.html" /> 
   </head>
   <body>
@@ -30,8 +31,8 @@
       <h3>Navigacija</h3>
       <ul>
         <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             accesskey="I">abecedni seznam</a></li>
+          <a href="uporaba.html" title="Uporaba"
+             accesskey="N">naprej</a></li>
         <li class="right" >
           <a href="arhitektura.html" title="Arhitektura"
              accesskey="P">nazaj</a> |</li>
@@ -58,6 +59,9 @@
   <h4>Prejšnja tema</h4>
   <p class="topless"><a href="arhitektura.html"
                         title="prejšnje poglavje">Arhitektura</a></p>
+  <h4>Naslednja tema</h4>
+  <p class="topless"><a href="uporaba.html"
+                        title="naslednje poglavje">Uporaba</a></p>
 <div id="searchbox" style="display: none">
   <h3>Hitro iskanje</h3>
     <form class="search" action="search.html" method="get">
@@ -79,8 +83,8 @@
       <h3>Navigacija</h3>
       <ul>
         <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             >abecedni seznam</a></li>
+          <a href="uporaba.html" title="Uporaba"
+             >naprej</a></li>
         <li class="right" >
           <a href="arhitektura.html" title="Arhitektura"
              >nazaj</a> |</li>
Index: trunk/docs/_build/html/uporaba.html
===================================================================
--- trunk/docs/_build/html/uporaba.html	(revision 10)
+++ trunk/docs/_build/html/uporaba.html	(revision 11)
@@ -30,11 +30,8 @@
       <h3>Navigacija</h3>
       <ul>
         <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             accesskey="I">abecedni seznam</a></li>
-        <li class="right" >
           <a href="api.html" title="API"
-             accesskey="P">nazaj</a> |</li>
+             accesskey="P">nazaj</a></li>
         <li><a href="index.html">LIDAR dokumentacija</a> &raquo;</li> 
       </ul>
     </div>  
@@ -135,11 +132,8 @@
       <h3>Navigacija</h3>
       <ul>
         <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             >abecedni seznam</a></li>
-        <li class="right" >
           <a href="api.html" title="API"
-             >nazaj</a> |</li>
+             >nazaj</a></li>
         <li><a href="index.html">LIDAR dokumentacija</a> &raquo;</li> 
       </ul>
     </div>
Index: trunk/docs/_build/html/opis.html
===================================================================
--- trunk/docs/_build/html/opis.html	(revision 10)
+++ trunk/docs/_build/html/opis.html	(revision 11)
@@ -31,11 +31,8 @@
       <h3>Navigacija</h3>
       <ul>
         <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             accesskey="I">abecedni seznam</a></li>
-        <li class="right" >
           <a href="arhitektura.html" title="Arhitektura"
-             accesskey="N">naprej</a> |</li>
+             accesskey="N">naprej</a></li>
         <li class="right" >
           <a href="index.html" title="LIDAR dokumentacija"
              accesskey="P">nazaj</a> |</li>
@@ -143,11 +140,8 @@
       <h3>Navigacija</h3>
       <ul>
         <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             >abecedni seznam</a></li>
-        <li class="right" >
           <a href="arhitektura.html" title="Arhitektura"
-             >naprej</a> |</li>
+             >naprej</a></li>
         <li class="right" >
           <a href="index.html" title="LIDAR dokumentacija"
              >nazaj</a> |</li>
Index: trunk/docs/_build/html/arhitektura.html
===================================================================
--- trunk/docs/_build/html/arhitektura.html	(revision 10)
+++ trunk/docs/_build/html/arhitektura.html	(revision 11)
@@ -31,11 +31,8 @@
       <h3>Navigacija</h3>
       <ul>
         <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             accesskey="I">abecedni seznam</a></li>
-        <li class="right" >
           <a href="api.html" title="API"
-             accesskey="N">naprej</a> |</li>
+             accesskey="N">naprej</a></li>
         <li class="right" >
           <a href="opis.html" title="Opis"
              accesskey="P">nazaj</a> |</li>
@@ -86,11 +83,8 @@
       <h3>Navigacija</h3>
       <ul>
         <li class="right" style="margin-right: 10px">
-          <a href="genindex.html" title="Splošni abecedni seznam"
-             >abecedni seznam</a></li>
-        <li class="right" >
           <a href="api.html" title="API"
-             >naprej</a> |</li>
+             >naprej</a></li>
         <li class="right" >
           <a href="opis.html" title="Opis"
              >nazaj</a> |</li>
Index: trunk/docs/_build/doctrees/api.doctree
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/docs/_build/doctrees/uporaba.doctree
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/docs/_build/doctrees/opis.doctree
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/docs/_build/doctrees/arhitektura.doctree
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/docs/_build/doctrees/environment.pickle
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/docs/_build/doctrees/index.doctree
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/web/WEB-INF
===================================================================
--- trunk/web/WEB-INF	(revision 10)
+++ trunk/web/WEB-INF	(revision 11)

Property changes on: trunk/web/WEB-INF
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/css
===================================================================
--- trunk/web/css	(revision 10)
+++ trunk/web/css	(revision 11)

Property changes on: trunk/web/css
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/dojo/dojo/cldr/nls/en
===================================================================
--- trunk/web/dojo/dojo/cldr/nls/en	(revision 10)
+++ trunk/web/dojo/dojo/cldr/nls/en	(revision 11)

Property changes on: trunk/web/dojo/dojo/cldr/nls/en
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/dojo/dojo/cldr/nls
===================================================================
--- trunk/web/dojo/dojo/cldr/nls	(revision 10)
+++ trunk/web/dojo/dojo/cldr/nls	(revision 11)

Property changes on: trunk/web/dojo/dojo/cldr/nls
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/dojo/dojo/cldr
===================================================================
--- trunk/web/dojo/dojo/cldr	(revision 10)
+++ trunk/web/dojo/dojo/cldr	(revision 11)

Property changes on: trunk/web/dojo/dojo/cldr
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/dojo/dojo
===================================================================
--- trunk/web/dojo/dojo	(revision 10)
+++ trunk/web/dojo/dojo	(revision 11)

Property changes on: trunk/web/dojo/dojo
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/dojo/dojox/layout/ext-dijit/layout
===================================================================
--- trunk/web/dojo/dojox/layout/ext-dijit/layout	(revision 10)
+++ trunk/web/dojo/dojox/layout/ext-dijit/layout	(revision 11)

Property changes on: trunk/web/dojo/dojox/layout/ext-dijit/layout
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/dojo/dojox/layout/ext-dijit
===================================================================
--- trunk/web/dojo/dojox/layout/ext-dijit	(revision 10)
+++ trunk/web/dojo/dojox/layout/ext-dijit	(revision 11)

Property changes on: trunk/web/dojo/dojox/layout/ext-dijit
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/dojo/dojox/layout
===================================================================
--- trunk/web/dojo/dojox/layout	(revision 10)
+++ trunk/web/dojo/dojox/layout	(revision 11)

Property changes on: trunk/web/dojo/dojox/layout
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/dojo/dojox/robot
===================================================================
--- trunk/web/dojo/dojox/robot	(revision 10)
+++ trunk/web/dojo/dojox/robot	(revision 11)

Property changes on: trunk/web/dojo/dojox/robot
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/dojo/dojox
===================================================================
--- trunk/web/dojo/dojox	(revision 10)
+++ trunk/web/dojo/dojox	(revision 11)

Property changes on: trunk/web/dojo/dojox
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/dojo
===================================================================
--- trunk/web/dojo	(revision 10)
+++ trunk/web/dojo	(revision 11)

Property changes on: trunk/web/dojo
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/js
===================================================================
--- trunk/web/js	(revision 10)
+++ trunk/web/js	(revision 11)

Property changes on: trunk/web/js
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/apikey.jsp
===================================================================
--- trunk/web/apikey.jsp	(revision 0)
+++ trunk/web/apikey.jsp	(revision 11)
@@ -0,0 +1,7 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<p>Za uporabo LIDAR naprave morate pridobiti API ključ. To lahko storite spodaj...</p>
+<hr/>
+<label for="key">API Key:</label> <input type="text" id="key" name="key" dojoType="dijit.form.TextBox" trim="true"/>
+<button dojoType="dijit.form.Button" type="button">Generate<script type="dojo/method" event="onClick" args="evt">
+        dijit.byId("key").setValue("Thank you!");
+</script></button>
\ No newline at end of file
Index: trunk/web/status.jsp
===================================================================
--- trunk/web/status.jsp	(revision 10)
+++ trunk/web/status.jsp	(revision 11)
@@ -15,4 +15,7 @@
 %>
 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/>
\ No newline at end of file
+Motion port: <strong><%= c.getString("devices.motion.port") %></strong><br/>
+<script type="text/javascript">
+    alert('status');
+</script>
\ No newline at end of file
Index: trunk/web/META-INF
===================================================================
--- trunk/web/META-INF	(revision 10)
+++ trunk/web/META-INF	(revision 11)

Property changes on: trunk/web/META-INF
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/web/index.jsp
===================================================================
--- trunk/web/index.jsp	(revision 10)
+++ trunk/web/index.jsp	(revision 11)
@@ -17,12 +17,13 @@
     </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>
 
@@ -32,6 +33,9 @@
         <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>
Index: trunk/web
===================================================================
--- trunk/web	(revision 10)
+++ trunk/web	(revision 11)

Property changes on: trunk/web
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/test
===================================================================
--- trunk/test	(revision 10)
+++ trunk/test	(revision 11)

Property changes on: trunk/test
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/nbproject/project.properties
===================================================================
--- trunk/nbproject/project.properties	(revision 10)
+++ trunk/nbproject/project.properties	(revision 11)
@@ -1,6 +1,5 @@
 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
Index: trunk/nbproject
===================================================================
--- trunk/nbproject	(revision 10)
+++ trunk/nbproject	(revision 11)

Property changes on: trunk/nbproject
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/src/java/org/lidar/LogServlet.java
===================================================================
--- trunk/src/java/org/lidar/LogServlet.java	(revision 10)
+++ trunk/src/java/org/lidar/LogServlet.java	(revision 11)
@@ -1,8 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
 package org.lidar;
 
 import com.google.gson.Gson;
@@ -19,12 +14,12 @@
 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
@@ -32,7 +27,7 @@
      * @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();
@@ -39,10 +34,10 @@
         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"));
             }
 
@@ -54,7 +49,7 @@
             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) {
@@ -66,11 +61,12 @@
     }
 
     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;
@@ -78,7 +74,7 @@
     }
 
     // <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
@@ -87,11 +83,11 @@
      */
     @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
@@ -100,11 +96,11 @@
      */
     @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
      */
@@ -112,5 +108,4 @@
     public String getServletInfo() {
         return "Short description";
     }// </editor-fold>
-
 }
Index: trunk/src/java/org/lidar/api/Sensor.java
===================================================================
--- trunk/src/java/org/lidar/api/Sensor.java	(revision 10)
+++ trunk/src/java/org/lidar/api/Sensor.java	(revision 11)
@@ -13,7 +13,7 @@
 @WebService()
 public class Sensor extends Serial {
 
-    public Sensor(){
+    public Sensor() {
         super("sensor");
         openPort();
     }
@@ -22,58 +22,57 @@
      * 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.
@@ -80,8 +79,6 @@
      * @param gainData Gain profil.
      */
     @WebMethod()
-    public void sendGain(short[] gainData){
-
-	}
-
+    public void sendGain(short[] gainData) {
+    }
 }
Index: trunk/src/java/org/lidar/api/Management.java
===================================================================
--- trunk/src/java/org/lidar/api/Management.java	(revision 10)
+++ trunk/src/java/org/lidar/api/Management.java	(revision 11)
@@ -19,11 +19,11 @@
  */
 @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;
 
@@ -31,10 +31,12 @@
      * 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;
     }
 
@@ -43,7 +45,7 @@
      * @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;
@@ -53,7 +55,7 @@
             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();
@@ -70,13 +72,13 @@
      * @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 {
@@ -84,7 +86,7 @@
                 // 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) {
@@ -96,23 +98,27 @@
     }
 
     @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;
         }
@@ -119,5 +125,4 @@
 
         return true;
     }
-
 }
Index: trunk/src/java/org/lidar/api/Motion.java
===================================================================
--- trunk/src/java/org/lidar/api/Motion.java	(revision 10)
+++ trunk/src/java/org/lidar/api/Motion.java	(revision 11)
@@ -14,7 +14,7 @@
 @WebService()
 public class Motion extends Serial {
 
-    public Motion(){
+    public Motion() {
         super("motion");
         openPort();
     }
@@ -25,9 +25,8 @@
      * @param freq
      */
     @WebMethod()
-    public void setMove0(int steps, float freq){
-        
-	}
+    public void setMove0(int steps, float freq) {
+    }
 
     /**
      * Sets parameters for next motor move
@@ -35,229 +34,203 @@
      * @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
@@ -264,7 +237,6 @@
      * @param interval
      */
     @WebMethod()
-    public void setAutomaticPositionReporting(short interval){
-
-	}
+    public void setAutomaticPositionReporting(short interval) {
+    }
 }
Index: trunk/src/java/org/lidar/api/Laser.java
===================================================================
--- trunk/src/java/org/lidar/api/Laser.java	(revision 10)
+++ trunk/src/java/org/lidar/api/Laser.java	(revision 11)
@@ -13,7 +13,8 @@
  */
 @WebService()
 public class Laser extends Serial {
-    public Laser(){
+
+    public Laser() {
         super("laser");
         openPort();
     }
@@ -22,7 +23,7 @@
      * 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");
     }
 
@@ -30,30 +31,33 @@
      * 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:
@@ -63,7 +67,7 @@
         }
 
         return false;
-	}
+    }
 
     /**
      * Omogoci oz. onemogoci Q-Switch opcijo.
@@ -70,13 +74,13 @@
      * @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.
@@ -83,13 +87,13 @@
      * @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.
@@ -97,16 +101,18 @@
      * @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.
@@ -114,16 +120,18 @@
      * @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.
@@ -130,16 +138,18 @@
      * 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.
@@ -146,16 +156,18 @@
      * @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.
@@ -163,14 +175,16 @@
      * @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;
-	}
+    }
 }
Index: trunk/src/java/org/lidar/api/Video.java
===================================================================
--- trunk/src/java/org/lidar/api/Video.java	(revision 10)
+++ trunk/src/java/org/lidar/api/Video.java	(revision 11)
@@ -11,12 +11,13 @@
  */
 @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) {
@@ -23,4 +24,4 @@
             return null;
         }
     }
-}
\ No newline at end of file
+}
Index: trunk/src/java/org/lidar/api
===================================================================
--- trunk/src/java/org/lidar/api	(revision 10)
+++ trunk/src/java/org/lidar/api	(revision 11)

Property changes on: trunk/src/java/org/lidar/api
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/src/java/org/lidar/Util.java
===================================================================
--- trunk/src/java/org/lidar/Util.java	(revision 10)
+++ trunk/src/java/org/lidar/Util.java	(revision 11)
@@ -10,17 +10,20 @@
  * @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;
     }
 
@@ -35,19 +38,19 @@
         }
 
         // 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
Index: trunk/src/java/org/lidar/HibernateUtil.java
===================================================================
--- trunk/src/java/org/lidar/HibernateUtil.java	(revision 10)
+++ trunk/src/java/org/lidar/HibernateUtil.java	(revision 11)
@@ -7,21 +7,22 @@
  *
  * @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;
-  }
-}
\ No newline at end of file
+    public static SessionFactory getSessionFactory() {
+        return sessionFactory;
+    }
+}
Index: trunk/src/java/org/lidar/Serial.java
===================================================================
--- trunk/src/java/org/lidar/Serial.java	(revision 10)
+++ trunk/src/java/org/lidar/Serial.java	(revision 11)
@@ -12,6 +12,7 @@
  * @author Andrej Cimpersek
  */
 public class Serial {
+
     private boolean isOpened = false;
     private String deviceName;
     private String portName;
@@ -22,8 +23,8 @@
     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));
@@ -38,13 +39,12 @@
      *   (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;
             }
@@ -56,19 +56,21 @@
      * 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
-                10000   // 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
+                    10000 // Wait max. 10 sec. to acquire port
+                    );
+        } catch (PortInUseException e) {
             return false;
         }
 
@@ -75,15 +77,18 @@
         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;
@@ -104,8 +109,10 @@
         }
     }
 
-    public void closePort(){
-        if(this.port == null) return;
+    public void closePort() {
+        if (this.port == null) {
+            return;
+        }
         try {
             this.inputStream.close();
             this.outputStream.close();
@@ -119,7 +126,7 @@
     /**
      * Write shortcut for string
      */
-    public boolean sendCommand(String lockToken, String string){
+    public boolean sendCommand(String lockToken, String string) {
         return sendCommand(lockToken, string.getBytes());
     }
 
@@ -128,11 +135,13 @@
      * @param bytes
      * @return boolean
      */
-    public boolean sendCommand(String lockToken, byte[] bytes){
+    public boolean sendCommand(String lockToken, byte[] bytes) {
         // TODO: worker, ki odklene po X času brez dostopa
-        if(!Management.locked || lockToken != Management.lockToken) return false;
+        if (!Management.locked || lockToken != Management.lockToken) {
+            return false;
+        }
         Management.lockAccess = new Date();
-        
+
         try {
             outputStream.write(bytes);
         } catch (Exception e) {
@@ -148,7 +157,7 @@
      *       guaranteed by the API specification.
      * @param event The output buffer empty event
      */
-    protected void onOutputBufferEmpty(SerialPortEvent event){
+    protected void onOutputBufferEmpty(SerialPortEvent event) {
         //TODO: implement
     }
 
@@ -156,7 +165,7 @@
      * Handle data available events.
      * @param event The data available event
      */
-    protected void onDataAvailable(SerialPortEvent event){
+    protected void onDataAvailable(SerialPortEvent event) {
         //TODO: implement
     }
 }
Index: trunk/src/java/org/lidar/auth/LDAPAdapter.java
===================================================================
--- trunk/src/java/org/lidar/auth/LDAPAdapter.java	(revision 10)
+++ trunk/src/java/org/lidar/auth/LDAPAdapter.java	(revision 11)
@@ -1,36 +0,0 @@
-package org.lidar.auth;
-
-import java.util.Hashtable;
-import javax.naming.Context;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-
-public class LDAPAdapter implements IAuthAdapter {
-    private String LDAP_HOST = "ldap://localhost:389/o=JNDITutorial";
-    private String LDAP_O = "UPR.SI";
-    private String LDAP_OU = "FAMNIT";
-
-    public LDAPAdapter(/*String host*/){
-        //HOST = provider;
-    }
-
-    public boolean IsValid(String username, String password) {
-        // Set up the environment for creating the initial context
-        Hashtable env = new Hashtable();
-        env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
-        env.put(Context.PROVIDER_URL, LDAP_HOST);
-
-        // Authenticate as S. User and password "mysecret"
-        env.put(Context.SECURITY_AUTHENTICATION, "simple");
-        env.put(Context.SECURITY_PRINCIPAL, "CN=" + username + ", OU=" + LDAP_OU + ", O=" + LDAP_O);
-        env.put(Context.SECURITY_CREDENTIALS, password);
-
-        try {
-           DirContext ctx = new InitialDirContext(env);
-           return true;
-        } catch (Exception e) {
-           return false;
-        }
-    }
-    
-}
Index: trunk/src/java/org/lidar/auth/DBAdapter.java
===================================================================
--- trunk/src/java/org/lidar/auth/DBAdapter.java	(revision 10)
+++ trunk/src/java/org/lidar/auth/DBAdapter.java	(revision 11)
@@ -1,27 +0,0 @@
-package org.lidar.auth;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.cfg.Configuration;
-
-/**
- *
- * @author Andrej Cimpersek
- */
-public class DBAdapter implements IAuthAdapter {
-
-    public boolean IsValid(String username, String password) {
-        SessionFactory sessionFactory = new Configuration().configure().buildSessionFactory();
-        Session session = sessionFactory.openSession();
-        Transaction tx = session.beginTransaction();
-
-        
-
-        tx.commit();
-        session.close();
-
-        return true;
-    }
-
-}
Index: trunk/src/java/org/lidar/auth/IAuthAdapter.java
===================================================================
--- trunk/src/java/org/lidar/auth/IAuthAdapter.java	(revision 10)
+++ trunk/src/java/org/lidar/auth/IAuthAdapter.java	(revision 11)
@@ -1,9 +0,0 @@
-package org.lidar.auth;
-
-/**
- *
- * @author Andrej Cimpersek
- */
-public interface IAuthAdapter {
-    public boolean IsValid(String username, String password);
-}
Index: trunk/src/java/org/lidar/auth/DummyAdapter.java
===================================================================
--- trunk/src/java/org/lidar/auth/DummyAdapter.java	(revision 10)
+++ trunk/src/java/org/lidar/auth/DummyAdapter.java	(revision 11)
@@ -1,13 +0,0 @@
-package org.lidar.auth;
-
-/**
- * Dummy authentication adapter that always returns true
- * @author Andrej Cimpersek
- */
-public class DummyAdapter implements IAuthAdapter {
-
-    public boolean IsValid(String username, String password) {
-        return true;
-    }
-
-}
Index: trunk/src/java/org/lidar/auth/Authentication.java
===================================================================
--- trunk/src/java/org/lidar/auth/Authentication.java	(revision 10)
+++ trunk/src/java/org/lidar/auth/Authentication.java	(revision 11)
@@ -1,25 +0,0 @@
-package org.lidar.auth;
-
-/**
- *
- * @author Andrej Cimpersek
- */
-public class Authentication {
-    private IAuthAdapter adapter;
-
-    public Authentication(){
-        this.adapter = new DummyAdapter();
-    }
-
-    public boolean IsValid(String username, String password){
-        return this.adapter.IsValid(username, password);
-    }
-
-    public void SetAdapter(IAuthAdapter adapter){
-        this.adapter = adapter;
-    }
-
-    public IAuthAdapter GetAdapter(){
-        return this.adapter;
-    }
-}
Index: trunk/src/java/org/lidar/auth
===================================================================
--- trunk/src/java/org/lidar/auth	(revision 10)
+++ trunk/src/java/org/lidar/auth	(revision 11)

Property changes on: trunk/src/java/org/lidar/auth
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/src/java/org/lidar/Position.java
===================================================================
--- trunk/src/java/org/lidar/Position.java	(revision 10)
+++ trunk/src/java/org/lidar/Position.java	(revision 11)
@@ -5,6 +5,7 @@
  * @author Andrej Cimpersek
  */
 public class Position {
+
     public int position0;
     public int position1;
 }
Index: trunk/src/java/org/lidar/Config.java
===================================================================
--- trunk/src/java/org/lidar/Config.java	(revision 10)
+++ trunk/src/java/org/lidar/Config.java	(revision 11)
@@ -8,10 +8,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);
@@ -23,7 +24,7 @@
         return configuration;
     }
 
-    public static void save(){
+    public static void save() {
         try {
             configuration.save("/etc/lidar/config.xml");
         } catch (Exception e) {
Index: trunk/src/java/org/lidar/db/Client.java
===================================================================
--- trunk/src/java/org/lidar/db/Client.java	(revision 10)
+++ trunk/src/java/org/lidar/db/Client.java	(revision 11)
@@ -4,20 +4,22 @@
 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;
@@ -24,7 +26,7 @@
     }
 
     @Id
-    @GeneratedValue(strategy=GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     public Integer getId() {
         return this.id;
     }
@@ -33,7 +35,7 @@
         this.id = id;
     }
 
-    @Column(name="apikey")
+    @Column(name = "apikey")
     public String getApiKey() {
         return this.apiKey;
     }
@@ -50,4 +52,11 @@
         this.token = token;
     }
 
+    public String getUsername() {
+        return this.username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
 }
Index: trunk/src/java/org/lidar/db/AuthTokens.java
===================================================================
--- trunk/src/java/org/lidar/db/AuthTokens.java	(revision 10)
+++ trunk/src/java/org/lidar/db/AuthTokens.java	(revision 11)
@@ -8,15 +8,16 @@
  * @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;
Index: trunk/src/java/org/lidar/db
===================================================================
--- trunk/src/java/org/lidar/db	(revision 10)
+++ trunk/src/java/org/lidar/db	(revision 11)

Property changes on: trunk/src/java/org/lidar/db
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/src/java/org/lidar
===================================================================
--- trunk/src/java/org/lidar	(revision 10)
+++ trunk/src/java/org/lidar	(revision 11)

Property changes on: trunk/src/java/org/lidar
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/src/java/org
===================================================================
--- trunk/src/java/org	(revision 10)
+++ trunk/src/java/org	(revision 11)

Property changes on: trunk/src/java/org
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/src/java
===================================================================
--- trunk/src/java	(revision 10)
+++ trunk/src/java	(revision 11)

Property changes on: trunk/src/java
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
Index: trunk/src
===================================================================
--- trunk/src	(revision 10)
+++ trunk/src	(revision 11)

Property changes on: trunk/src
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build
