# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1294956789 -3600
# Node ID cdfc1e9e3a1b1a51ff77faa9f406b65f4d9eba4e
# Parent  e146e2e3b80baeea9646e19a71a12e926169708b
Spokojenost: pokračování.

diff -r e146e2e3b80b -r cdfc1e9e3a1b java/nekurak.net-ear/nbproject/project.properties
--- a/java/nekurak.net-ear/nbproject/project.properties	Wed Jan 12 16:15:37 2011 +0100
+++ b/java/nekurak.net-ear/nbproject/project.properties	Thu Jan 13 23:13:09 2011 +0100
@@ -12,7 +12,7 @@
 j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args}
 j2ee.deploy.on.save=false
 j2ee.platform=1.6
-j2ee.platform.classpath=${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar
+j2ee.platform.classpath=
 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
diff -r e146e2e3b80b -r cdfc1e9e3a1b java/nekurak.net-ejb/nbproject/project.properties
--- a/java/nekurak.net-ejb/nbproject/project.properties	Wed Jan 12 16:15:37 2011 +0100
+++ b/java/nekurak.net-ejb/nbproject/project.properties	Thu Jan 13 23:13:09 2011 +0100
@@ -24,7 +24,7 @@
 includes=**
 j2ee.deploy.on.save=false
 j2ee.platform=1.6
-j2ee.platform.classpath=${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar
+j2ee.platform.classpath=
 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
diff -r e146e2e3b80b -r cdfc1e9e3a1b java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Kurackost.java
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Kurackost.java	Wed Jan 12 16:15:37 2011 +0100
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Kurackost.java	Thu Jan 13 23:13:09 2011 +0100
@@ -7,7 +7,8 @@
  */
 public class Kurackost {
 
-	private int id;
+	/** 0 = neznámý stav */
+	private int id = 0;
 
 	public int getId() {
 		return id;
diff -r e146e2e3b80b -r cdfc1e9e3a1b java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java	Wed Jan 12 16:15:37 2011 +0100
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java	Thu Jan 13 23:13:09 2011 +0100
@@ -28,7 +28,7 @@
 	private Set<Kategorie> kategorie = new HashSet<Kategorie>();
 	private Double sirka;
 	private Double delka;
-	private Kurackost kurackost;
+	private Kurackost kurackost = new Kurackost();
 
 	public Podnik() {
 	}
diff -r e146e2e3b80b -r cdfc1e9e3a1b java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/VysledekHlasovani.java
--- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/VysledekHlasovani.java	Wed Jan 12 16:15:37 2011 +0100
+++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/VysledekHlasovani.java	Thu Jan 13 23:13:09 2011 +0100
@@ -11,7 +11,6 @@
 public class VysledekHlasovani {
 
 	private static final Logger log = Logger.getLogger(VysledekHlasovani.class.getSimpleName());
-
 	private int hlasuAno;
 	private int hlasuNe;
 	private Podnik podnik;
@@ -45,7 +44,7 @@
 	public Boolean getSpokojenost() {
 		int k = podnik.getKurackost().getId();
 
-		if (k == 0) {
+		if (k == 0 || (hlasuAno == 0 && hlasuNe == 0)) {
 			/** neznámý stav → neznámá spokojenost */
 			return null;
 		} else if (k == 1 || k == 4) {
@@ -59,7 +58,7 @@
 			int soucet = hlasuAno + hlasuNe;
 			return hlasuAno > 0.35 * soucet && hlasuAno < 0.65 * soucet;
 		} else {
-			log.log(Level.SEVERE, "Neznámá hodnota kuřáckosti: {0} u podniku: {1}", new Integer[] {k, podnik.getId()});
+			log.log(Level.SEVERE, "Neznámá hodnota kuřáckosti: {0} u podniku: {1}", new Integer[]{k, podnik.getId()});
 			return null;
 		}
 	}
diff -r e146e2e3b80b -r cdfc1e9e3a1b java/nekurak.net-web/web/styl.css
--- a/java/nekurak.net-web/web/styl.css	Wed Jan 12 16:15:37 2011 +0100
+++ b/java/nekurak.net-web/web/styl.css	Thu Jan 13 23:13:09 2011 +0100
@@ -303,7 +303,7 @@
 	margin-left: 20px;
 	padding: 0 10px 0 12px;
 	background: silver;
-	color: #666;
+	color: #444;
 	text-decoration: none;
 	-moz-border-radius-bottomright:		4px;
 	-webkit-border-bottom-right-radius:	4px;
diff -r e146e2e3b80b -r cdfc1e9e3a1b java/nekurak.net-ws/nbproject/build-impl.xml
--- a/java/nekurak.net-ws/nbproject/build-impl.xml	Wed Jan 12 16:15:37 2011 +0100
+++ b/java/nekurak.net-ws/nbproject/build-impl.xml	Thu Jan 13 23:13:09 2011 +0100
@@ -18,6 +18,7 @@
 
         -->
 <project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="nekurak.net-ws-impl">
+    <import file="jaxws-build.xml"/>
     <import file="ant-deploy.xml"/>
     <fail message="Please build using Ant 1.7.1 or higher.">
         <condition>
diff -r e146e2e3b80b -r cdfc1e9e3a1b java/nekurak.net-ws/nbproject/genfiles.properties
--- a/java/nekurak.net-ws/nbproject/genfiles.properties	Wed Jan 12 16:15:37 2011 +0100
+++ b/java/nekurak.net-ws/nbproject/genfiles.properties	Thu Jan 13 23:13:09 2011 +0100
@@ -3,8 +3,8 @@
 build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=8b9ba573
-nbproject/build-impl.xml.script.CRC32=14e75ae9
+nbproject/build-impl.xml.data.CRC32=e6e63e07
+nbproject/build-impl.xml.script.CRC32=9b10bf3f
 nbproject/build-impl.xml.stylesheet.CRC32=8419264d@1.24.3.1
 nbproject/wsit-deploy.xml.data.CRC32=4cb22909
 nbproject/wsit-deploy.xml.script.CRC32=deb039de
diff -r e146e2e3b80b -r cdfc1e9e3a1b java/nekurak.net-ws/nbproject/jax-ws.xml
--- a/java/nekurak.net-ws/nbproject/jax-ws.xml	Wed Jan 12 16:15:37 2011 +0100
+++ b/java/nekurak.net-ws/nbproject/jax-ws.xml	Thu Jan 13 23:13:09 2011 +0100
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jax-ws xmlns="http://www.netbeans.org/ns/jax-ws/1">
   <services>
+    <service name="Podnik">
+      <implementation-class>cz.frantovo.nekurak.ws.Podnik</implementation-class>
+    </service>
+    <service name="Pokus">
+      <implementation-class>cz.frantovo.nekurak.ws.Pokus</implementation-class>
+    </service>
   </services>
   <clients/>
 </jax-ws>
diff -r e146e2e3b80b -r cdfc1e9e3a1b java/nekurak.net-ws/nbproject/jaxws-build.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/nekurak.net-ws/nbproject/jaxws-build.xml	Thu Jan 13 23:13:09 2011 +0100
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+        *** GENERATED FROM jax-ws.xml - DO NOT EDIT !                             ***
+        *** TO MODIFY wsimport options USE Web Service node -> Edit WS Attributes ***
+        *** TO CHANGE TARGETS GENERATED TO jaxws-build.xml COPY THOSE             ***
+        *** TARGETS TO ../build.xml AND MODIFY THAT FILE INSTEAD                  ***
+
+        -->
+<project xmlns:xalan="http://xml.apache.org/xslt" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1">
+    <!--
+                ===================
+                JAX-WS WSGEN SECTION
+                ===================
+            -->
+    <target name="wsgen-init" depends="init, -do-compile">
+        <mkdir dir="${build.generated.sources.dir}/jax-ws/resources/"/>
+        <mkdir dir="${build.classes.dir}"/>
+        <taskdef name="wsgen" classname="com.sun.tools.ws.ant.WsGen">
+            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
+        </taskdef>
+    </target>
+    <target name="wsgen-Podnik" depends="wsgen-init">
+        <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" xendorsed="true" keep="true" genwsdl="true" sei="cz.frantovo.nekurak.ws.Podnik">
+            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
+        </wsgen>
+    </target>
+    <target name="wsgen-Pokus" depends="wsgen-init">
+        <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" xendorsed="true" keep="true" genwsdl="true" sei="cz.frantovo.nekurak.ws.Pokus">
+            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
+        </wsgen>
+    </target>
+    <!--
+                ===================
+                JAX-WS WSIMPORT SECTION
+                ===================
+            -->
+</project>
diff -r e146e2e3b80b -r cdfc1e9e3a1b java/nekurak.net-ws/nbproject/project.xml
--- a/java/nekurak.net-ws/nbproject/project.xml	Wed Jan 12 16:15:37 2011 +0100
+++ b/java/nekurak.net-ws/nbproject/project.xml	Thu Jan 13 23:13:09 2011 +0100
@@ -2,7 +2,9 @@
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <type>org.netbeans.modules.web.project</type>
     <configuration>
-        <buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1"/>
+        <buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1">
+            <extension file="jaxws-build.xml" id="jaxws"/>
+        </buildExtensions>
         <data xmlns="http://www.netbeans.org/ns/web-project/3">
             <name>nekurak.net-ws</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>