This file was deleted.

This file was deleted.

@@ -26,22 +26,20 @@
* Gesellschaft zur Foerderung der Wissenschaft e.V.
* All rights reserved. Use is subject to license terms.
*/
package org.escidoc.browser.elabsmodul.view.subcontent;
package org.escidoc.browser.elabsmodul.views;

import java.util.ArrayList;
import java.util.List;

import javax.xml.transform.TransformerException;

import org.escidoc.browser.elabsmodul.constants.ELabViewContants;
import org.escidoc.browser.elabsmodul.controller.InstrumentController;
import org.escidoc.browser.elabsmodul.controller.utils.DOM2String;
import org.escidoc.browser.elabsmodul.interfaces.ILabsAction;
import org.escidoc.browser.elabsmodul.interfaces.ILabsPanel;
import org.escidoc.browser.elabsmodul.interfaces.ISaveAction;
import org.escidoc.browser.elabsmodul.model.InstrumentBean;
import org.escidoc.browser.elabsmodul.view.helper.LabsLayoutHelper;
import org.escidoc.browser.elabsmodul.view.listeners.LabsClientViewEventHandler;
import org.escidoc.browser.elabsmodul.views.helper.LabsLayoutHelper;
import org.escidoc.browser.elabsmodul.views.listeners.LabsClientViewEventHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;

import com.vaadin.data.util.POJOItem;
import com.vaadin.event.LayoutEvents.LayoutClickListener;
@@ -52,8 +50,6 @@
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;

import de.escidoc.core.resources.om.item.Item;

public class LabsInstrumentPanel extends Panel implements ILabsPanel, ILabsAction {

private static final long serialVersionUID = -7601252311598579746L;
@@ -80,9 +76,12 @@ public class LabsInstrumentPanel extends Panel implements ILabsPanel, ILabsActio

private HorizontalLayout buttonLayout = null;

public LabsInstrumentPanel(InstrumentBean sourceBean) {
private final ISaveAction saveComponent;

public LabsInstrumentPanel(InstrumentBean sourceBean, ISaveAction saveComponent) {

this.instrumentBean = (sourceBean != null) ? sourceBean : new InstrumentBean();
this.saveComponent = saveComponent;

initialisePanelComponents();
buildPanelGUI();
@@ -176,7 +175,7 @@ private void createClickListener() {
@Override
public void buttonClick(com.vaadin.ui.Button.ClickEvent event) {
if (event.getButton().getCaption().equals("Save")) {
LabsInstrumentPanel.this.saveAction();
LabsInstrumentPanel.this.saveComponent.saveAction(LabsInstrumentPanel.this.instrumentBean);
}
else if (event.getButton().getCaption().equals("Cancel")) {
// TODO reset function
@@ -229,29 +228,34 @@ public POJOItem<InstrumentBean> getPojoItem() {
}

@Override
public void saveAction() {
Item item;
try {
Element domElement = InstrumentController.createDOMElementByBeanModel(instrumentBean);
try {
LOG.warn("DOM to SAVE...");
LOG.info(DOM2String.convertDom2String(domElement));
}
catch (TransformerException e) {
LOG.error(e.getMessage());
}
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((instrumentBean == null) ? 0 : instrumentBean.hashCode());
return result;
}

/*
* item = itemRepositories.findItemById(resourceProxy.getId()); MetadataRecord metadataRecord =
* item.getMetadataRecords().get("escidoc"); metadataRecord.setContent(InstrumentController
* .createDOMElementByBeanModel(instrumentBean)); itemRepositories.update(resourceProxy.getId(), item);
*
* this.mainWindow.showNotification("Save", "View is saved", Notification.TYPE_HUMANIZED_MESSAGE);
*/
@Override
public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
final LabsInstrumentPanel other = (LabsInstrumentPanel) obj;
if (instrumentBean == null) {
if (other.instrumentBean != null) {
return false;
}
}
catch (Throwable e) {
LOG.error(e.getMessage());
else if (!instrumentBean.equals(other.instrumentBean)) {
return false;
}
return true;
}

}
@@ -26,7 +26,7 @@
* Gesellschaft zur Foerderung der Wissenschaft e.V.
* All rights reserved. Use is subject to license terms.
*/
package org.escidoc.browser.elabsmodul.view.helper;
package org.escidoc.browser.elabsmodul.views.helper;

import static org.escidoc.browser.elabsmodul.constants.ELabViewContants.DIV_ALIGN_RIGHT;
import static org.escidoc.browser.elabsmodul.constants.ELabViewContants.DIV_END;
@@ -26,7 +26,7 @@
* Gesellschaft zur Foerderung der Wissenschaft e.V.
* All rights reserved. Use is subject to license terms.
*/
package org.escidoc.browser.elabsmodul.view.listeners;
package org.escidoc.browser.elabsmodul.views.listeners;

import static org.escidoc.browser.elabsmodul.constants.ELabViewContants.USER_DESCR_ON_FORM_LAYOUT_TO_SAVE;
import static org.escidoc.browser.elabsmodul.constants.ELabViewContants.USER_DESCR_ON_HOR_LAYOUT_TO_EDIT;
@@ -37,9 +37,9 @@

import java.util.List;

import org.escidoc.browser.elabsmodul.view.helper.LabsLayoutHelper;
import org.escidoc.browser.elabsmodul.view.subcontent.ILabsAction;
import org.escidoc.browser.elabsmodul.view.subcontent.ILabsPanel;
import org.escidoc.browser.elabsmodul.interfaces.ILabsAction;
import org.escidoc.browser.elabsmodul.interfaces.ILabsPanel;
import org.escidoc.browser.elabsmodul.views.helper.LabsLayoutHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@@ -249,8 +249,4 @@ public AbstractComponent getFormComponent() {
public LabsClientTextFieldEventHandler getClientTextFieldEventHandler() {
return clientTextFieldEventHandler;
}

private void saveComponent(Component component) {
this.containerPanel.saveAction();
}
}