RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Substituting tabs by spaces at java files in order to follow code conventions.

Browse source
This commit is contained in:
Óscar González Fernández 2009-08-10 12:11:29 +02:00
parent 836ff36580
commit 62f46c73e3
12 changed files with 155 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
ganttzk-demo-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java
View file

@ -10,39 +10,39 @@ import org.zkoss.zk.ui.util.GenericForwardComposer;
public class PageForErrorOnEvent extends GenericForwardComposer { public class PageForErrorOnEvent extends GenericForwardComposer {
private static final Log LOG = LogFactory.getLog(PageForErrorOnEvent.class); private static final Log LOG = LogFactory.getLog(PageForErrorOnEvent.class);
private Component modalWindow; private Component modalWindow;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp); super.doAfterCompose(comp);
logError(); logError();
modalWindow = comp; modalWindow = comp;
} }
private void logError() { private void logError() {
Throwable exception = (Throwable) Executions.getCurrent().getAttribute( Throwable exception = (Throwable) Executions.getCurrent().getAttribute(
"javax.servlet.error.exception"); "javax.servlet.error.exception");
String errorMessage = (String) Executions.getCurrent().getAttribute( String errorMessage = (String) Executions.getCurrent().getAttribute(
"javax.servlet.error.message"); "javax.servlet.error.message");
LOG.error(errorMessage, exception); LOG.error(errorMessage, exception);
} }
public void onClick$continueWorking() { public void onClick$continueWorking() {
modalWindow.detach(); modalWindow.detach();
} }
public void onClick$reload() { public void onClick$reload() {
Executions.sendRedirect(null); Executions.sendRedirect(null);
} }
public void onClick$quitSession() { public void onClick$quitSession() {
HttpServletRequest nativeRequest = (HttpServletRequest) Executions HttpServletRequest nativeRequest = (HttpServletRequest) Executions
.getCurrent().getNativeRequest(); .getCurrent().getNativeRequest();
nativeRequest.getSession().invalidate(); nativeRequest.getSession().invalidate();
Executions.sendRedirect("/"); Executions.sendRedirect("/");
} }
} }

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
View file

@ -172,7 +172,7 @@ public class Task extends TaskElement {
} }
return true; return true;
} }
@Override @Override
public Integer defaultWorkHours() { public Integer defaultWorkHours() {

62
navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportDAOTest.java
View file

@ -28,41 +28,41 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional @Transactional
public class WorkReportDAOTest extends AbstractWorkReportTest { public class WorkReportDAOTest extends AbstractWorkReportTest {
@Autowired @Autowired
private IWorkReportDAO workReportDAO; private IWorkReportDAO workReportDAO;
@Test @Test
public void testInSpringContainer() { public void testInSpringContainer() {
assertNotNull(workReportDAO); assertNotNull(workReportDAO);
} }
@Test @Test
public void testSaveWorkReport() { public void testSaveWorkReport() {
WorkReport workReport = createValidWorkReport(); WorkReport workReport = createValidWorkReport();
workReportDAO.save(workReport); workReportDAO.save(workReport);
assertTrue(workReportDAO.exists(workReport.getId())); assertTrue(workReportDAO.exists(workReport.getId()));
} }
@Test @Test
public void testRemoveWorkReport() throws InstanceNotFoundException { public void testRemoveWorkReport() throws InstanceNotFoundException {
WorkReport workReport = createValidWorkReport(); WorkReport workReport = createValidWorkReport();
workReportDAO.save(workReport); workReportDAO.save(workReport);
workReportDAO.remove(workReport.getId()); workReportDAO.remove(workReport.getId());
assertFalse(workReportDAO.exists(workReport.getId())); assertFalse(workReportDAO.exists(workReport.getId()));
} }
@Test @Test
public void testListWorkReport() { public void testListWorkReport() {
int previous = workReportDAO.list(WorkReport.class).size(); int previous = workReportDAO.list(WorkReport.class).size();
WorkReport workReport1 = createValidWorkReport(); WorkReport workReport1 = createValidWorkReport();
workReportDAO.save(workReport1); workReportDAO.save(workReport1);
WorkReport workReport2 = createValidWorkReport(); WorkReport workReport2 = createValidWorkReport();
workReportDAO.save(workReport1); workReportDAO.save(workReport1);
workReportDAO.save(workReport2); workReportDAO.save(workReport2);
List<WorkReport> list = workReportDAO List<WorkReport> list = workReportDAO
.list(WorkReport.class); .list(WorkReport.class);
assertEquals(previous + 2, list.size()); assertEquals(previous + 2, list.size());
} }
} }

54
navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportLineDAOTest.java
View file

@ -27,36 +27,36 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional @Transactional
public class WorkReportLineDAOTest extends AbstractWorkReportTest { public class WorkReportLineDAOTest extends AbstractWorkReportTest {
@Autowired @Autowired
private IWorkReportLineDAO workReportLineDAO; private IWorkReportLineDAO workReportLineDAO;
@Test @Test
public void testSaveWorkReportLine() { public void testSaveWorkReportLine() {
WorkReportLine workReportLine = createValidWorkReportLine(); WorkReportLine workReportLine = createValidWorkReportLine();
workReportLineDAO.save(workReportLine); workReportLineDAO.save(workReportLine);
assertTrue(workReportLineDAO.exists(workReportLine.getId())); assertTrue(workReportLineDAO.exists(workReportLine.getId()));
} }
@Test @Test
public void testRemoveWorkReportLine() throws InstanceNotFoundException { public void testRemoveWorkReportLine() throws InstanceNotFoundException {
WorkReportLine workReportLine = createValidWorkReportLine(); WorkReportLine workReportLine = createValidWorkReportLine();
workReportLineDAO.save(workReportLine); workReportLineDAO.save(workReportLine);
workReportLineDAO.remove(workReportLine.getId()); workReportLineDAO.remove(workReportLine.getId());
assertFalse(workReportLineDAO.exists(workReportLine.getId())); assertFalse(workReportLineDAO.exists(workReportLine.getId()));
} }
@Test @Test
public void testListWorkReportLine() { public void testListWorkReportLine() {
int previous = workReportLineDAO.list(WorkReportLine.class).size(); int previous = workReportLineDAO.list(WorkReportLine.class).size();
WorkReportLine workReportType1 = createValidWorkReportLine(); WorkReportLine workReportType1 = createValidWorkReportLine();
workReportLineDAO.save(workReportType1); workReportLineDAO.save(workReportType1);
WorkReportLine workReportType2 = createValidWorkReportLine(); WorkReportLine workReportType2 = createValidWorkReportLine();
workReportLineDAO.save(workReportType1); workReportLineDAO.save(workReportType1);
workReportLineDAO.save(workReportType2); workReportLineDAO.save(workReportType2);
List<WorkReportLine> list = workReportLineDAO List<WorkReportLine> list = workReportLineDAO
.list(WorkReportLine.class); .list(WorkReportLine.class);
assertEquals(previous + 2, list.size()); assertEquals(previous + 2, list.size());
} }
} }

54
navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportTypeDAOTest.java
View file

@ -27,36 +27,36 @@ import org.springframework.transaction.annotation.Transactional;
@Transactional @Transactional
public class WorkReportTypeDAOTest extends AbstractWorkReportTest { public class WorkReportTypeDAOTest extends AbstractWorkReportTest {
@Autowired @Autowired
private IWorkReportTypeDAO workReportTypeDAO; private IWorkReportTypeDAO workReportTypeDAO;
@Test @Test
public void testSaveWorkReportType() { public void testSaveWorkReportType() {
WorkReportType workReportType = createValidWorkReportType(); WorkReportType workReportType = createValidWorkReportType();
workReportTypeDAO.save(workReportType); workReportTypeDAO.save(workReportType);
assertTrue(workReportTypeDAO.exists(workReportType.getId())); assertTrue(workReportTypeDAO.exists(workReportType.getId()));
} }
@Test @Test
public void testRemoveWorkReportType() throws InstanceNotFoundException { public void testRemoveWorkReportType() throws InstanceNotFoundException {
WorkReportType workReportType = createValidWorkReportType(); WorkReportType workReportType = createValidWorkReportType();
workReportTypeDAO.save(workReportType); workReportTypeDAO.save(workReportType);
workReportTypeDAO.remove(workReportType.getId()); workReportTypeDAO.remove(workReportType.getId());
assertFalse(workReportTypeDAO.exists(workReportType.getId())); assertFalse(workReportTypeDAO.exists(workReportType.getId()));
} }
@Test @Test
public void testListWorkReportType() { public void testListWorkReportType() {
int previous = workReportTypeDAO.list(WorkReportType.class).size(); int previous = workReportTypeDAO.list(WorkReportType.class).size();
WorkReportType workReportType1 = createValidWorkReportType(); WorkReportType workReportType1 = createValidWorkReportType();
workReportTypeDAO.save(workReportType1); workReportTypeDAO.save(workReportType1);
WorkReportType workReportType2 = createValidWorkReportType(); WorkReportType workReportType2 = createValidWorkReportType();
workReportTypeDAO.save(workReportType1); workReportTypeDAO.save(workReportType1);
workReportTypeDAO.save(workReportType2); workReportTypeDAO.save(workReportType2);
List<WorkReportType> list = workReportTypeDAO List<WorkReportType> list = workReportTypeDAO
.list(WorkReportType.class); .list(WorkReportType.class);
assertEquals(previous + 2, list.size()); assertEquals(previous + 2, list.size());
} }
} }

8
navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportLineTest.java
View file

@ -9,9 +9,9 @@ import org.junit.Test;
*/ */
public class WorkReportLineTest { public class WorkReportLineTest {
@Test @Test
public void testWorkReportLineTest() { public void testWorkReportLineTest() {
assertTrue(true); assertTrue(true);
} }
} }

8
navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTest.java
View file

@ -9,8 +9,8 @@ import org.junit.Test;
*/ */
public class WorkReportTest { public class WorkReportTest {
@Test @Test
public void testWorkReportTest() { public void testWorkReportTest() {
assertTrue(true); assertTrue(true);
} }
} }

8
navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTypeTest.java
View file

@ -9,8 +9,8 @@ import org.junit.Test;
*/ */
public class WorkReportTypeTest { public class WorkReportTypeTest {
@Test @Test
public void testWorkReportTypeTest() { public void testWorkReportTypeTest() {
assertTrue(true); assertTrue(true);
} }
} }

2
navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
View file

@ -225,7 +225,7 @@ public class FunctionalityExposedForExtensions<T> implements IContext<T> {
return planner; return planner;
} }
@Override @Override
public void replace(T oldDomainObject, T newDomainObject) { public void replace(T oldDomainObject, T newDomainObject) {
Position position = remove(oldDomainObject); Position position = remove(oldDomainObject);
add(position, newDomainObject); add(position, newDomainObject);

54
navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java
View file

@ -10,39 +10,39 @@ import org.zkoss.zk.ui.util.GenericForwardComposer;
public class PageForErrorOnEvent extends GenericForwardComposer { public class PageForErrorOnEvent extends GenericForwardComposer {
private static final Log LOG = LogFactory.getLog(PageForErrorOnEvent.class); private static final Log LOG = LogFactory.getLog(PageForErrorOnEvent.class);
private Component modalWindow; private Component modalWindow;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp); super.doAfterCompose(comp);
logError(); logError();
modalWindow = comp; modalWindow = comp;
} }
private void logError() { private void logError() {
Throwable exception = (Throwable) Executions.getCurrent().getAttribute( Throwable exception = (Throwable) Executions.getCurrent().getAttribute(
"javax.servlet.error.exception"); "javax.servlet.error.exception");
String errorMessage = (String) Executions.getCurrent().getAttribute( String errorMessage = (String) Executions.getCurrent().getAttribute(
"javax.servlet.error.message"); "javax.servlet.error.message");
LOG.error(errorMessage, exception); LOG.error(errorMessage, exception);
} }
public void onClick$continueWorking() { public void onClick$continueWorking() {
modalWindow.detach(); modalWindow.detach();
} }
public void onClick$reload() { public void onClick$reload() {
Executions.sendRedirect(null); Executions.sendRedirect(null);
} }
public void onClick$quitSession() { public void onClick$quitSession() {
HttpServletRequest nativeRequest = (HttpServletRequest) Executions HttpServletRequest nativeRequest = (HttpServletRequest) Executions
.getCurrent().getNativeRequest(); .getCurrent().getNativeRequest();
nativeRequest.getSession().invalidate(); nativeRequest.getSession().invalidate();
Executions.sendRedirect("/"); Executions.sendRedirect("/");
} }
} }

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java
View file

@ -47,7 +47,7 @@ public class OrderElementModel implements IOrderElementModel {
@Override @Override
@Transactional(readOnly = true) @Transactional(readOnly = true)
public void setCurrent(OrderElement orderElement, OrderModel order) { public void setCurrent(OrderElement orderElement, OrderModel order) {
orderElementDao.save(orderElement); orderElementDao.save(orderElement);
for (HoursGroup hoursGroup : orderElement.getHoursGroups()) { for (HoursGroup hoursGroup : orderElement.getHoursGroups()) {

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ITaskElementAdapter.java
View file

@ -10,6 +10,6 @@ import org.zkoss.ganttz.adapters.IAdapterToTaskFundamentalProperties;
*/ */
public interface ITaskElementAdapter extends IAdapterToTaskFundamentalProperties<TaskElement>{ public interface ITaskElementAdapter extends IAdapterToTaskFundamentalProperties<TaskElement>{
void setOrder(Order order); void setOrder(Order order);
} }