Skip to content

Commit

Permalink
vista de la grafica dinamica
Browse files Browse the repository at this point in the history
  • Loading branch information
Angie Amud committed Apr 6, 2014
1 parent 3928572 commit a3390ff
Show file tree
Hide file tree
Showing 15 changed files with 790 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build/
/build/
/nbproject/private/
51 changes: 41 additions & 10 deletions nbproject/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,24 @@
<condition property="do.display.browser">
<istrue value="${display.browser}"/>
</condition>
<condition property="do.display.browser.debug.old">
<and>
<isset property="do.display.browser"/>
<not>
<isset property="do.debug.client"/>
</not>
<not>
<isset property="browser.context"/>
</not>
</and>
</condition>
<condition property="do.display.browser.debug">
<and>
<isset property="do.display.browser"/>
<not>
<isset property="do.debug.client"/>
</not>
<isset property="browser.context"/>
</and>
</condition>
<available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
Expand Down Expand Up @@ -458,7 +470,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
</fileset>
</union>
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
<testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="TemperatureControl" testname="TestNG tests" workingDir="${basedir}">
<testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="TemperatureControl" testname="TestNG tests" workingDir="${basedir}">
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
<propertyset>
<propertyref prefix="test-sys-prop."/>
Expand Down Expand Up @@ -959,28 +971,28 @@ exists or setup the property manually. For example like this:
<dirname file="${dist.war}" property="dist.jar.dir"/>
<mkdir dir="${dist.jar.dir}"/>
<jar compress="${jar.compress}" jarfile="${dist.war}">
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
</jar>
</target>
<target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
<dirname file="${dist.war}" property="dist.jar.dir"/>
<mkdir dir="${dist.jar.dir}"/>
<jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
</jar>
</target>
<target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
<dirname file="${dist.war}" property="dist.jar.dir"/>
<mkdir dir="${dist.jar.dir}"/>
<jar compress="${jar.compress}" jarfile="${dist.war}">
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
</jar>
</target>
<target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
<dirname file="${dist.war}" property="dist.jar.dir"/>
<mkdir dir="${dist.jar.dir}"/>
<jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
</jar>
</target>
<target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
Expand All @@ -996,7 +1008,7 @@ exists or setup the property manually. For example like this:
<dirname file="${dist.ear.war}" property="dist.jar.dir"/>
<mkdir dir="${dist.jar.dir}"/>
<jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
<fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
</jar>
</target>
<target name="-post-dist">
Expand Down Expand Up @@ -1045,18 +1057,32 @@ exists or setup the property manually. For example like this:
<target depends="init,-pre-dist,dist,-post-dist" name="verify">
<nbverify file="${dist.war}"/>
</target>
<target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
<target depends="run-deploy,-init-display-browser,-display-browser-nb-old,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
<target if="do.display.browser" name="-init-display-browser">
<condition property="do.display.browser.nb.old">
<and>
<isset property="netbeans.home"/>
<not>
<isset property="browser.context"/>
</not>
</and>
</condition>
<condition property="do.display.browser.nb">
<isset property="netbeans.home"/>
<and>
<isset property="netbeans.home"/>
<isset property="browser.context"/>
</and>
</condition>
<condition property="do.display.browser.cl">
<isset property="deploy.ant.enabled"/>
</condition>
</target>
<target if="do.display.browser.nb" name="-display-browser-nb">
<target if="do.display.browser.nb.old" name="-display-browser-nb-old">
<nbbrowse url="${client.url}"/>
</target>
<target if="do.display.browser.nb" name="-display-browser-nb">
<nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
</target>
<target if="do.display.browser.cl" name="-get-browser" unless="browser">
<condition property="browser" value="rundll32">
<os family="windows"/>
Expand Down Expand Up @@ -1124,6 +1150,7 @@ exists or setup the property manually. For example like this:
<nbstartserver debugmode="true"/>
<antcall target="connect-debugger"/>
<nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
<antcall target="debug-display-browser-old"/>
<antcall target="debug-display-browser"/>
<antcall target="connect-client-debugger"/>
</target>
Expand All @@ -1140,9 +1167,12 @@ exists or setup the property manually. For example like this:
</sourcepath>
</nbjpdaconnect>
</target>
<target if="do.display.browser.debug" name="debug-display-browser">
<target if="do.display.browser.debug.old" name="debug-display-browser-old">
<nbbrowse url="${client.url}"/>
</target>
<target if="do.display.browser.debug" name="debug-display-browser">
<nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
</target>
<target if="do.debug.client" name="connect-client-debugger">
<webproject1:nbjsdebugstart webUrl="${client.url}"/>
</target>
Expand Down Expand Up @@ -1237,6 +1267,7 @@ exists or setup the property manually. For example like this:
<startprofiler/>
<nbstartserver profilemode="true"/>
<nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/>
<antcall target="debug-display-browser-old"/>
<antcall target="debug-display-browser"/>
<antcall target="-profile-start-loadgen"/>
</target>
Expand Down
4 changes: 2 additions & 2 deletions nbproject/genfiles.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=651128d4@1.43.0.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=0bfcb608
nbproject/build-impl.xml.script.CRC32=d3cba5f6
nbproject/build-impl.xml.stylesheet.CRC32=5459df51@1.43.0.1
nbproject/build-impl.xml.script.CRC32=6df73aaa
nbproject/build-impl.xml.stylesheet.CRC32=d659eb7a@1.65.1.1
1 change: 1 addition & 0 deletions nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ annotation.processing.processor.options=-Aeclipselink.canonicalmodel.use_static_
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
auxiliary.org-netbeans-modules-projectapi.jsf_2e_language=Facelets
build.classes.dir=${build.web.dir}/WEB-INF/classes
build.classes.excludes=**/*.java,**/*.form
build.dir=build
Expand Down
85 changes: 85 additions & 0 deletions src/java/Bundle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
PersistenceErrorOccured=A persistence error occurred.
Previous=Previous
Next=Next

ProcessCreated=Process was successfully created.
ProcessUpdated=Process was successfully updated.
ProcessDeleted=Process was successfully deleted.
CreateProcessTitle=Create New Process
CreateProcessSaveLink=Save
CreateProcessShowAllLink=Show All Process Items
CreateProcessIndexLink=Index
CreateProcessLabel_id=Id:
CreateProcessTitle_id=Id
CreateProcessLabel_maxTemp=MaxTemp:
CreateProcessTitle_maxTemp=MaxTemp
CreateProcessLabel_targetTemp=TargetTemp:
CreateProcessTitle_targetTemp=TargetTemp
CreateProcessLabel_sterilizationTime=SterilizationTime:
CreateProcessTitle_sterilizationTime=SterilizationTime
CreateProcessLabel_itemDescription=ItemDescription:
CreateProcessTitle_itemDescription=ItemDescription
CreateProcessLabel_userDescription=UserDescription:
CreateProcessTitle_userDescription=UserDescription
CreateProcessLabel_temp=Temp:
CreateProcessTitle_temp=Temp
CreateProcessLabel_initialDate=InitialDate:
CreateProcessTitle_initialDate=InitialDate
EditProcessTitle=Edit Process
EditProcessSaveLink=Save
EditProcessViewLink=View
EditProcessShowAllLink=Show All Process Items
EditProcessIndexLink=Index
EditProcessLabel_id=Id:
EditProcessTitle_id=Id
EditProcessLabel_maxTemp=MaxTemp:
EditProcessTitle_maxTemp=MaxTemp
EditProcessLabel_targetTemp=TargetTemp:
EditProcessTitle_targetTemp=TargetTemp
EditProcessLabel_sterilizationTime=SterilizationTime:
EditProcessTitle_sterilizationTime=SterilizationTime
EditProcessLabel_itemDescription=ItemDescription:
EditProcessTitle_itemDescription=ItemDescription
EditProcessLabel_userDescription=UserDescription:
EditProcessTitle_userDescription=UserDescription
EditProcessLabel_temp=Temp:
EditProcessTitle_temp=Temp
EditProcessLabel_initialDate=InitialDate:
EditProcessTitle_initialDate=InitialDate
ViewProcessTitle=View
ViewProcessDestroyLink=Destroy
ViewProcessEditLink=Edit
ViewProcessCreateLink=Create New Process
ViewProcessShowAllLink=Show All Process Items
ViewProcessIndexLink=Index
ViewProcessLabel_id=Id:
ViewProcessTitle_id=Id
ViewProcessLabel_maxTemp=MaxTemp:
ViewProcessTitle_maxTemp=MaxTemp
ViewProcessLabel_targetTemp=TargetTemp:
ViewProcessTitle_targetTemp=TargetTemp
ViewProcessLabel_sterilizationTime=SterilizationTime:
ViewProcessTitle_sterilizationTime=SterilizationTime
ViewProcessLabel_itemDescription=ItemDescription:
ViewProcessTitle_itemDescription=ItemDescription
ViewProcessLabel_userDescription=UserDescription:
ViewProcessTitle_userDescription=UserDescription
ViewProcessLabel_temp=Temp:
ViewProcessTitle_temp=Temp
ViewProcessLabel_initialDate=InitialDate:
ViewProcessTitle_initialDate=InitialDate
ListProcessTitle=List
ListProcessEmpty=(No Process Items Found)
ListProcessDestroyLink=Destroy
ListProcessEditLink=Edit
ListProcessViewLink=View
ListProcessCreateLink=Create New Process
ListProcessIndexLink=Index
ListProcessTitle_id=Id
ListProcessTitle_maxTemp=MaxTemp
ListProcessTitle_targetTemp=TargetTemp
ListProcessTitle_sterilizationTime=SterilizationTime
ListProcessTitle_itemDescription=ItemDescription
ListProcessTitle_userDescription=UserDescription
ListProcessTitle_temp=Temp
ListProcessTitle_initialDate=InitialDate
64 changes: 64 additions & 0 deletions src/java/edu/temperature/entity/AbstractFacade.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/

package edu.temperature.entity;

import java.util.List;
import javax.persistence.EntityManager;

/**
*
* @author samsung
*/
public abstract class AbstractFacade<T> {
private Class<T> entityClass;

public AbstractFacade(Class<T> entityClass) {
this.entityClass = entityClass;
}

protected abstract EntityManager getEntityManager();

public void create(T entity) {
getEntityManager().persist(entity);
}

public void edit(T entity) {
getEntityManager().merge(entity);
}

public void remove(T entity) {
getEntityManager().remove(getEntityManager().merge(entity));
}

public T find(Object id) {
return getEntityManager().find(entityClass, id);
}

public List<T> findAll() {
javax.persistence.criteria.CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery();
cq.select(cq.from(entityClass));
return getEntityManager().createQuery(cq).getResultList();
}

public List<T> findRange(int[] range) {
javax.persistence.criteria.CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery();
cq.select(cq.from(entityClass));
javax.persistence.Query q = getEntityManager().createQuery(cq);
q.setMaxResults(range[1] - range[0] + 1);
q.setFirstResult(range[0]);
return q.getResultList();
}

public int count() {
javax.persistence.criteria.CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery();
javax.persistence.criteria.Root<T> rt = cq.from(entityClass);
cq.select(getEntityManager().getCriteriaBuilder().count(rt));
javax.persistence.Query q = getEntityManager().createQuery(cq);
return ((Long) q.getSingleResult()).intValue();
}

}
Loading

0 comments on commit a3390ff

Please sign in to comment.