From 62f46c73e3c1e1a4a014ac1b3ec4ce9199407dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 10 Aug 2009 12:11:29 +0200 Subject: [PATCH] Substituting tabs by spaces at java files in order to follow code conventions. --- .../web/error/PageForErrorOnEvent.java | 54 ++++++++-------- .../business/planner/entities/Task.java | 2 +- .../workreports/daos/WorkReportDAOTest.java | 62 +++++++++---------- .../daos/WorkReportLineDAOTest.java | 54 ++++++++-------- .../daos/WorkReportTypeDAOTest.java | 54 ++++++++-------- .../entities/WorkReportLineTest.java | 8 +-- .../workreports/entities/WorkReportTest.java | 8 +-- .../entities/WorkReportTypeTest.java | 8 +-- .../FunctionalityExposedForExtensions.java | 2 +- .../web/error/PageForErrorOnEvent.java | 54 ++++++++-------- .../web/orders/OrderElementModel.java | 2 +- .../web/planner/ITaskElementAdapter.java | 2 +- 12 files changed, 155 insertions(+), 155 deletions(-) diff --git a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java index 91c042e33..f50e47385 100644 --- a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java +++ b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java @@ -10,39 +10,39 @@ import org.zkoss.zk.ui.util.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 - public void doAfterCompose(Component comp) throws Exception { - super.doAfterCompose(comp); - logError(); - modalWindow = comp; + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + logError(); + modalWindow = comp; - } + } - private void logError() { - Throwable exception = (Throwable) Executions.getCurrent().getAttribute( - "javax.servlet.error.exception"); - String errorMessage = (String) Executions.getCurrent().getAttribute( - "javax.servlet.error.message"); - LOG.error(errorMessage, exception); - } + private void logError() { + Throwable exception = (Throwable) Executions.getCurrent().getAttribute( + "javax.servlet.error.exception"); + String errorMessage = (String) Executions.getCurrent().getAttribute( + "javax.servlet.error.message"); + LOG.error(errorMessage, exception); + } - public void onClick$continueWorking() { - modalWindow.detach(); - } + public void onClick$continueWorking() { + modalWindow.detach(); + } - public void onClick$reload() { - Executions.sendRedirect(null); - } + public void onClick$reload() { + Executions.sendRedirect(null); + } - public void onClick$quitSession() { - HttpServletRequest nativeRequest = (HttpServletRequest) Executions - .getCurrent().getNativeRequest(); - nativeRequest.getSession().invalidate(); - Executions.sendRedirect("/"); - } + public void onClick$quitSession() { + HttpServletRequest nativeRequest = (HttpServletRequest) Executions + .getCurrent().getNativeRequest(); + nativeRequest.getSession().invalidate(); + Executions.sendRedirect("/"); + } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java index c8c6e1d61..f138dceb6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java @@ -172,7 +172,7 @@ public class Task extends TaskElement { } return true; - } + } @Override public Integer defaultWorkHours() { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportDAOTest.java index 4fda477f4..1f3c151a1 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportDAOTest.java @@ -28,41 +28,41 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class WorkReportDAOTest extends AbstractWorkReportTest { - @Autowired - private IWorkReportDAO workReportDAO; + @Autowired + private IWorkReportDAO workReportDAO; - @Test - public void testInSpringContainer() { - assertNotNull(workReportDAO); - } + @Test + public void testInSpringContainer() { + assertNotNull(workReportDAO); + } - @Test - public void testSaveWorkReport() { - WorkReport workReport = createValidWorkReport(); - workReportDAO.save(workReport); - assertTrue(workReportDAO.exists(workReport.getId())); - } + @Test + public void testSaveWorkReport() { + WorkReport workReport = createValidWorkReport(); + workReportDAO.save(workReport); + assertTrue(workReportDAO.exists(workReport.getId())); + } - @Test - public void testRemoveWorkReport() throws InstanceNotFoundException { - WorkReport workReport = createValidWorkReport(); - workReportDAO.save(workReport); - workReportDAO.remove(workReport.getId()); - assertFalse(workReportDAO.exists(workReport.getId())); - } + @Test + public void testRemoveWorkReport() throws InstanceNotFoundException { + WorkReport workReport = createValidWorkReport(); + workReportDAO.save(workReport); + workReportDAO.remove(workReport.getId()); + assertFalse(workReportDAO.exists(workReport.getId())); + } - @Test - public void testListWorkReport() { - int previous = workReportDAO.list(WorkReport.class).size(); + @Test + public void testListWorkReport() { + int previous = workReportDAO.list(WorkReport.class).size(); - WorkReport workReport1 = createValidWorkReport(); - workReportDAO.save(workReport1); - WorkReport workReport2 = createValidWorkReport(); - workReportDAO.save(workReport1); - workReportDAO.save(workReport2); + WorkReport workReport1 = createValidWorkReport(); + workReportDAO.save(workReport1); + WorkReport workReport2 = createValidWorkReport(); + workReportDAO.save(workReport1); + workReportDAO.save(workReport2); - List list = workReportDAO - .list(WorkReport.class); - assertEquals(previous + 2, list.size()); - } + List list = workReportDAO + .list(WorkReport.class); + assertEquals(previous + 2, list.size()); + } } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportLineDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportLineDAOTest.java index 5b759adda..0ed9e395b 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportLineDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportLineDAOTest.java @@ -27,36 +27,36 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class WorkReportLineDAOTest extends AbstractWorkReportTest { - @Autowired - private IWorkReportLineDAO workReportLineDAO; + @Autowired + private IWorkReportLineDAO workReportLineDAO; - @Test - public void testSaveWorkReportLine() { - WorkReportLine workReportLine = createValidWorkReportLine(); - workReportLineDAO.save(workReportLine); - assertTrue(workReportLineDAO.exists(workReportLine.getId())); - } + @Test + public void testSaveWorkReportLine() { + WorkReportLine workReportLine = createValidWorkReportLine(); + workReportLineDAO.save(workReportLine); + assertTrue(workReportLineDAO.exists(workReportLine.getId())); + } - @Test - public void testRemoveWorkReportLine() throws InstanceNotFoundException { - WorkReportLine workReportLine = createValidWorkReportLine(); - workReportLineDAO.save(workReportLine); - workReportLineDAO.remove(workReportLine.getId()); - assertFalse(workReportLineDAO.exists(workReportLine.getId())); - } + @Test + public void testRemoveWorkReportLine() throws InstanceNotFoundException { + WorkReportLine workReportLine = createValidWorkReportLine(); + workReportLineDAO.save(workReportLine); + workReportLineDAO.remove(workReportLine.getId()); + assertFalse(workReportLineDAO.exists(workReportLine.getId())); + } - @Test - public void testListWorkReportLine() { - int previous = workReportLineDAO.list(WorkReportLine.class).size(); + @Test + public void testListWorkReportLine() { + int previous = workReportLineDAO.list(WorkReportLine.class).size(); - WorkReportLine workReportType1 = createValidWorkReportLine(); - workReportLineDAO.save(workReportType1); - WorkReportLine workReportType2 = createValidWorkReportLine(); - workReportLineDAO.save(workReportType1); - workReportLineDAO.save(workReportType2); + WorkReportLine workReportType1 = createValidWorkReportLine(); + workReportLineDAO.save(workReportType1); + WorkReportLine workReportType2 = createValidWorkReportLine(); + workReportLineDAO.save(workReportType1); + workReportLineDAO.save(workReportType2); - List list = workReportLineDAO - .list(WorkReportLine.class); - assertEquals(previous + 2, list.size()); - } + List list = workReportLineDAO + .list(WorkReportLine.class); + assertEquals(previous + 2, list.size()); + } } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportTypeDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportTypeDAOTest.java index b9353316c..f287c5310 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportTypeDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/WorkReportTypeDAOTest.java @@ -27,36 +27,36 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class WorkReportTypeDAOTest extends AbstractWorkReportTest { - @Autowired - private IWorkReportTypeDAO workReportTypeDAO; + @Autowired + private IWorkReportTypeDAO workReportTypeDAO; - @Test - public void testSaveWorkReportType() { - WorkReportType workReportType = createValidWorkReportType(); - workReportTypeDAO.save(workReportType); - assertTrue(workReportTypeDAO.exists(workReportType.getId())); - } + @Test + public void testSaveWorkReportType() { + WorkReportType workReportType = createValidWorkReportType(); + workReportTypeDAO.save(workReportType); + assertTrue(workReportTypeDAO.exists(workReportType.getId())); + } - @Test - public void testRemoveWorkReportType() throws InstanceNotFoundException { - WorkReportType workReportType = createValidWorkReportType(); - workReportTypeDAO.save(workReportType); - workReportTypeDAO.remove(workReportType.getId()); - assertFalse(workReportTypeDAO.exists(workReportType.getId())); - } + @Test + public void testRemoveWorkReportType() throws InstanceNotFoundException { + WorkReportType workReportType = createValidWorkReportType(); + workReportTypeDAO.save(workReportType); + workReportTypeDAO.remove(workReportType.getId()); + assertFalse(workReportTypeDAO.exists(workReportType.getId())); + } - @Test - public void testListWorkReportType() { - int previous = workReportTypeDAO.list(WorkReportType.class).size(); + @Test + public void testListWorkReportType() { + int previous = workReportTypeDAO.list(WorkReportType.class).size(); - WorkReportType workReportType1 = createValidWorkReportType(); - workReportTypeDAO.save(workReportType1); - WorkReportType workReportType2 = createValidWorkReportType(); - workReportTypeDAO.save(workReportType1); - workReportTypeDAO.save(workReportType2); + WorkReportType workReportType1 = createValidWorkReportType(); + workReportTypeDAO.save(workReportType1); + WorkReportType workReportType2 = createValidWorkReportType(); + workReportTypeDAO.save(workReportType1); + workReportTypeDAO.save(workReportType2); - List list = workReportTypeDAO - .list(WorkReportType.class); - assertEquals(previous + 2, list.size()); - } + List list = workReportTypeDAO + .list(WorkReportType.class); + assertEquals(previous + 2, list.size()); + } } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportLineTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportLineTest.java index f0f3e8f5e..ca6acac1d 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportLineTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportLineTest.java @@ -9,9 +9,9 @@ import org.junit.Test; */ public class WorkReportLineTest { - @Test - public void testWorkReportLineTest() { - assertTrue(true); - } + @Test + public void testWorkReportLineTest() { + assertTrue(true); + } } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTest.java index ff3dd95a0..867bad2de 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTest.java @@ -9,8 +9,8 @@ import org.junit.Test; */ public class WorkReportTest { - @Test - public void testWorkReportTest() { - assertTrue(true); - } + @Test + public void testWorkReportTest() { + assertTrue(true); + } } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTypeTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTypeTest.java index afa2950a0..1a101d2ff 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTypeTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/entities/WorkReportTypeTest.java @@ -9,8 +9,8 @@ import org.junit.Test; */ public class WorkReportTypeTest { - @Test - public void testWorkReportTypeTest() { - assertTrue(true); - } + @Test + public void testWorkReportTypeTest() { + assertTrue(true); + } } diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java index ecd187549..144ea7ccc 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java @@ -225,7 +225,7 @@ public class FunctionalityExposedForExtensions implements IContext { return planner; } - @Override + @Override public void replace(T oldDomainObject, T newDomainObject) { Position position = remove(oldDomainObject); add(position, newDomainObject); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java index 91c042e33..f50e47385 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java @@ -10,39 +10,39 @@ import org.zkoss.zk.ui.util.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 - public void doAfterCompose(Component comp) throws Exception { - super.doAfterCompose(comp); - logError(); - modalWindow = comp; + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + logError(); + modalWindow = comp; - } + } - private void logError() { - Throwable exception = (Throwable) Executions.getCurrent().getAttribute( - "javax.servlet.error.exception"); - String errorMessage = (String) Executions.getCurrent().getAttribute( - "javax.servlet.error.message"); - LOG.error(errorMessage, exception); - } + private void logError() { + Throwable exception = (Throwable) Executions.getCurrent().getAttribute( + "javax.servlet.error.exception"); + String errorMessage = (String) Executions.getCurrent().getAttribute( + "javax.servlet.error.message"); + LOG.error(errorMessage, exception); + } - public void onClick$continueWorking() { - modalWindow.detach(); - } + public void onClick$continueWorking() { + modalWindow.detach(); + } - public void onClick$reload() { - Executions.sendRedirect(null); - } + public void onClick$reload() { + Executions.sendRedirect(null); + } - public void onClick$quitSession() { - HttpServletRequest nativeRequest = (HttpServletRequest) Executions - .getCurrent().getNativeRequest(); - nativeRequest.getSession().invalidate(); - Executions.sendRedirect("/"); - } + public void onClick$quitSession() { + HttpServletRequest nativeRequest = (HttpServletRequest) Executions + .getCurrent().getNativeRequest(); + nativeRequest.getSession().invalidate(); + Executions.sendRedirect("/"); + } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java index 510bef941..4f50e06d9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java @@ -47,7 +47,7 @@ public class OrderElementModel implements IOrderElementModel { @Override @Transactional(readOnly = true) - public void setCurrent(OrderElement orderElement, OrderModel order) { + public void setCurrent(OrderElement orderElement, OrderModel order) { orderElementDao.save(orderElement); for (HoursGroup hoursGroup : orderElement.getHoursGroups()) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ITaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ITaskElementAdapter.java index 71429e5c6..0f5b9ea04 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ITaskElementAdapter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ITaskElementAdapter.java @@ -10,6 +10,6 @@ import org.zkoss.ganttz.adapters.IAdapterToTaskFundamentalProperties; */ public interface ITaskElementAdapter extends IAdapterToTaskFundamentalProperties{ - void setOrder(Order order); + void setOrder(Order order); }