Added logs
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@176636 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
60f4d47855
commit
043e0cfc66
|
@ -22,7 +22,7 @@
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|
17
pom.xml
17
pom.xml
|
@ -43,9 +43,10 @@
|
||||||
<configDirectory>config</configDirectory>
|
<configDirectory>config</configDirectory>
|
||||||
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
|
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
|
||||||
|
|
||||||
|
|
||||||
<!-- Java -->
|
<!-- Java -->
|
||||||
<maven.compiler.source>1.7</maven.compiler.source>
|
<maven.compiler.source>1.7</maven.compiler.source>
|
||||||
|
<maven.compiler.target>1.8</maven.compiler.target>
|
||||||
|
|
||||||
<!-- GWT configuration -->
|
<!-- GWT configuration -->
|
||||||
<gwtVersion>2.6.1</gwtVersion>
|
<gwtVersion>2.6.1</gwtVersion>
|
||||||
|
@ -206,7 +207,7 @@
|
||||||
<artifactId>json</artifactId>
|
<artifactId>json</artifactId>
|
||||||
<version>20170516</version>
|
<version>20170516</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Notification -->
|
<!-- Notification -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portal</groupId>
|
<groupId>org.gcube.portal</groupId>
|
||||||
|
@ -403,7 +404,17 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
<!-- Maven Compiler Plugin -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
<version>2.3.2</version>
|
||||||
|
<configuration>
|
||||||
|
<source>${maven.compiler.source}</source>
|
||||||
|
<target>${maven.compiler.target}</target>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
|
@ -63,8 +63,6 @@ public class StatAlgoImporterController {
|
||||||
private NewCodeEvent newCodeEvent;
|
private NewCodeEvent newCodeEvent;
|
||||||
private ItemDescription mainCodeItemDescription;
|
private ItemDescription mainCodeItemDescription;
|
||||||
private ItemDescription binaryCodeItemDescription;
|
private ItemDescription binaryCodeItemDescription;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public StatAlgoImporterController() {
|
public StatAlgoImporterController() {
|
||||||
eventBus = new SimpleEventBus();
|
eventBus = new SimpleEventBus();
|
||||||
|
@ -260,7 +258,7 @@ public class StatAlgoImporterController {
|
||||||
if (eventType == null) {
|
if (eventType == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Log.info("StatAlgoRibbonEvent: " + event);
|
Log.info("StatAlgoRibbonEvent type: " + event);
|
||||||
|
|
||||||
switch (eventType) {
|
switch (eventType) {
|
||||||
case PROJECT_CREATE:
|
case PROJECT_CREATE:
|
||||||
|
@ -304,10 +302,11 @@ public class StatAlgoImporterController {
|
||||||
|
|
||||||
public void onSuccess(TextResource r) {
|
public void onSuccess(TextResource r) {
|
||||||
String s = r.getText();
|
String s = r.getText();
|
||||||
//Window.open(s, "Statistical Algorithms Importer Wiki", "");
|
// Window.open(s, "Statistical Algorithms Importer Wiki",
|
||||||
|
// "");
|
||||||
BrowserWindowSupport browserWindowSupport = BrowserWindowSupport.open("", "_blank", "");
|
BrowserWindowSupport browserWindowSupport = BrowserWindowSupport.open("", "_blank", "");
|
||||||
browserWindowSupport.setUrl(s);
|
browserWindowSupport.setUrl(s);
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} catch (ResourceException e) {
|
} catch (ResourceException e) {
|
||||||
|
@ -320,43 +319,50 @@ public class StatAlgoImporterController {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void doInputReadyCommand(InputReadyEvent event) {
|
private void doInputReadyCommand(InputReadyEvent event) {
|
||||||
if (!event.isValidData()) {
|
if (event != null) {
|
||||||
if (monitor != null) {
|
if (!event.isValidData()) {
|
||||||
monitor.hide();
|
if (monitor != null) {
|
||||||
|
monitor.hide();
|
||||||
|
}
|
||||||
|
Log.debug("Input not ready, invalid data.");
|
||||||
|
Log.debug("InputReadyEvent: " + event);
|
||||||
|
UtilsGXT3.alert("Attention", event.getError());
|
||||||
|
} else {
|
||||||
|
Log.info("Input Ready: " + inputRequestType);
|
||||||
|
if (inputRequestType == null) {
|
||||||
|
Log.debug("InputRequestType is null");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (inputRequestType) {
|
||||||
|
case Save:
|
||||||
|
pm.saveProject(event.getInputData(), monitor);
|
||||||
|
break;
|
||||||
|
case SoftwareCreate:
|
||||||
|
pm.softwareCreate(event.getInputData(), monitor);
|
||||||
|
break;
|
||||||
|
case NewMainCodeSet:
|
||||||
|
pm.setNewCode(event.getInputData(), newCodeEvent, monitor);
|
||||||
|
break;
|
||||||
|
case MainCodeSet:
|
||||||
|
pm.setMainCode(event.getInputData(), mainCodeItemDescription);
|
||||||
|
break;
|
||||||
|
case BinaryCodeSet:
|
||||||
|
pm.setBinaryCode(event.getInputData(), binaryCodeItemDescription);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
UtilsGXT3.alert("Attention", event.getError());
|
|
||||||
return;
|
|
||||||
} else {
|
} else {
|
||||||
Log.info("Input Ready: "+inputRequestType);
|
Log.debug("InputReadyEvent is null");
|
||||||
if (inputRequestType == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (inputRequestType) {
|
|
||||||
case Save:
|
|
||||||
pm.saveProject(event.getInputData(), monitor);
|
|
||||||
break;
|
|
||||||
case SoftwareCreate:
|
|
||||||
pm.softwareCreate(event.getInputData(), monitor);
|
|
||||||
break;
|
|
||||||
case NewMainCodeSet:
|
|
||||||
pm.setNewCode(event.getInputData(),newCodeEvent, monitor);
|
|
||||||
break;
|
|
||||||
case MainCodeSet:
|
|
||||||
pm.setMainCode(event.getInputData(), mainCodeItemDescription);
|
|
||||||
break;
|
|
||||||
case BinaryCodeSet:
|
|
||||||
pm.setBinaryCode(event.getInputData(), binaryCodeItemDescription);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void projectSaveRequest() {
|
private void projectSaveRequest() {
|
||||||
|
Log.debug("Project Save request");
|
||||||
monitor = new StatAlgoImporterMonitor();
|
monitor = new StatAlgoImporterMonitor();
|
||||||
inputRequestType = InputRequestType.Save;
|
inputRequestType = InputRequestType.Save;
|
||||||
InputRequestEvent inputRequestEvent = new InputRequestEvent();
|
InputRequestEvent inputRequestEvent = new InputRequestEvent();
|
||||||
|
@ -366,8 +372,8 @@ public class StatAlgoImporterController {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void softwareCreateRequest() {
|
private void softwareCreateRequest() {
|
||||||
|
Log.debug("SoftwareCreateRequest call");
|
||||||
final ConfirmMessageBox mb = new ConfirmMessageBox("Attention",
|
ConfirmMessageBox mb = new ConfirmMessageBox("Attention",
|
||||||
"The creation of new software will overwrite the possible previous version, moreover"
|
"The creation of new software will overwrite the possible previous version, moreover"
|
||||||
+ " the compiled software will be notified to the Infrastructure Administrators"
|
+ " the compiled software will be notified to the Infrastructure Administrators"
|
||||||
+ " and will be published in the suggested VREs. The source code will not be shared."
|
+ " and will be published in the suggested VREs. The source code will not be shared."
|
||||||
|
@ -376,26 +382,33 @@ public class StatAlgoImporterController {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDialogHide(DialogHideEvent event) {
|
public void onDialogHide(DialogHideEvent event) {
|
||||||
|
Log.debug("DialogHideEvent: "+event);
|
||||||
switch (event.getHideButton()) {
|
switch (event.getHideButton()) {
|
||||||
case NO:
|
case NO:
|
||||||
break;
|
break;
|
||||||
case YES:
|
case YES:
|
||||||
monitor = new StatAlgoImporterMonitor();
|
softwareCreateRetrieveInfo();
|
||||||
inputRequestType = InputRequestType.SoftwareCreate;
|
|
||||||
InputRequestEvent inputRequestEvent = new InputRequestEvent();
|
|
||||||
eventBus.fireEvent(inputRequestEvent);
|
|
||||||
Log.debug("SoftwareCreateRequest: " + inputRequestEvent);
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
mb.setWidth(300);
|
mb.setWidth(300);
|
||||||
mb.show();
|
mb.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void softwareCreateRetrieveInfo() {
|
||||||
|
monitor = new StatAlgoImporterMonitor();
|
||||||
|
inputRequestType = InputRequestType.SoftwareCreate;
|
||||||
|
InputRequestEvent inputRequestEvent = new InputRequestEvent();
|
||||||
|
Log.debug("SoftwareCreateRequest fire: " + inputRequestEvent);
|
||||||
|
eventBus.fireEvent(inputRequestEvent);
|
||||||
|
}
|
||||||
|
|
||||||
private void softwareRepackage() {
|
private void softwareRepackage() {
|
||||||
pm.softwareRepackage();
|
pm.softwareRepackage();
|
||||||
|
|
||||||
|
@ -420,42 +433,43 @@ public class StatAlgoImporterController {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void doMainCodeSetCommand(MainCodeSetEvent event) {
|
private void doMainCodeSetCommand(MainCodeSetEvent event) {
|
||||||
|
Log.debug("MainCodeSetEvent: "+event);
|
||||||
ItemDescription mainCodeItemDesc = event.getItemDescription();
|
ItemDescription mainCodeItemDesc = event.getItemDescription();
|
||||||
if (mainCodeItemDesc != null && mainCodeItemDesc.getId() != null) {
|
if (mainCodeItemDesc != null && mainCodeItemDesc.getId() != null) {
|
||||||
mainCodeItemDescription = mainCodeItemDesc;
|
mainCodeItemDescription = mainCodeItemDesc;
|
||||||
inputRequestType = InputRequestType.MainCodeSet;
|
inputRequestType = InputRequestType.MainCodeSet;
|
||||||
InputRequestEvent inputRequestEvent = new InputRequestEvent();
|
InputRequestEvent inputRequestEvent = new InputRequestEvent();
|
||||||
eventBus.fireEvent(inputRequestEvent);
|
|
||||||
Log.debug("ProjectMainCodeSetRequest: " + inputRequestEvent);
|
Log.debug("ProjectMainCodeSetRequest: " + inputRequestEvent);
|
||||||
|
eventBus.fireEvent(inputRequestEvent);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void doBinaryCodeSetCommand(BinaryCodeSetEvent event) {
|
private void doBinaryCodeSetCommand(BinaryCodeSetEvent event) {
|
||||||
|
Log.debug("BinaryCodeSetEvent: "+event);
|
||||||
ItemDescription binaryCodeItemDesc = event.getItemDescription();
|
ItemDescription binaryCodeItemDesc = event.getItemDescription();
|
||||||
if (binaryCodeItemDesc != null && binaryCodeItemDesc.getId() != null) {
|
if (binaryCodeItemDesc != null && binaryCodeItemDesc.getId() != null) {
|
||||||
binaryCodeItemDescription = binaryCodeItemDesc;
|
binaryCodeItemDescription = binaryCodeItemDesc;
|
||||||
inputRequestType = InputRequestType.BinaryCodeSet;
|
inputRequestType = InputRequestType.BinaryCodeSet;
|
||||||
InputRequestEvent inputRequestEvent = new InputRequestEvent();
|
InputRequestEvent inputRequestEvent = new InputRequestEvent();
|
||||||
eventBus.fireEvent(inputRequestEvent);
|
|
||||||
Log.debug("ProjectBinaryCodeSetRequest: " + inputRequestEvent);
|
Log.debug("ProjectBinaryCodeSetRequest: " + inputRequestEvent);
|
||||||
|
eventBus.fireEvent(inputRequestEvent);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void doSetNewMainCodeEvent(NewCodeEvent event) {
|
private void doSetNewMainCodeEvent(NewCodeEvent event) {
|
||||||
|
Log.debug("NewCodeEvent "+event);
|
||||||
monitor = new StatAlgoImporterMonitor();
|
monitor = new StatAlgoImporterMonitor();
|
||||||
newCodeEvent = event;
|
newCodeEvent = event;
|
||||||
inputRequestType = InputRequestType.NewMainCodeSet;
|
inputRequestType = InputRequestType.NewMainCodeSet;
|
||||||
InputRequestEvent inputRequestEvent = new InputRequestEvent();
|
InputRequestEvent inputRequestEvent = new InputRequestEvent();
|
||||||
eventBus.fireEvent(inputRequestEvent);
|
|
||||||
Log.debug("ProjectNewMainCodeSetRequest: " + inputRequestEvent);
|
Log.debug("ProjectNewMainCodeSetRequest: " + inputRequestEvent);
|
||||||
|
eventBus.fireEvent(inputRequestEvent);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void doDeleteItemCommand(DeleteItemEvent event) {
|
private void doDeleteItemCommand(DeleteItemEvent event) {
|
||||||
ItemDescription itemDescription = event.getItemDescription();
|
ItemDescription itemDescription = event.getItemDescription();
|
||||||
if (itemDescription != null && itemDescription.getId() != null) {
|
if (itemDescription != null && itemDescription.getId() != null) {
|
||||||
|
|
|
@ -13,22 +13,21 @@ import com.google.gwt.event.shared.HasHandlers;
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class InputRequestEvent extends
|
public class InputRequestEvent extends GwtEvent<InputRequestEvent.InputRequestEventHandler> {
|
||||||
GwtEvent<InputRequestEvent.InputRequestEventHandler> {
|
|
||||||
|
|
||||||
public static Type<InputRequestEventHandler> TYPE = new Type<InputRequestEventHandler>();
|
public static Type<InputRequestEventHandler> TYPE = new Type<InputRequestEventHandler>();
|
||||||
|
private boolean requested;
|
||||||
|
|
||||||
public interface InputRequestEventHandler extends EventHandler {
|
public interface InputRequestEventHandler extends EventHandler {
|
||||||
void onInputRequest(InputRequestEvent event);
|
void onInputRequest(InputRequestEvent event);
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface HasInputRequestEventHandler extends HasHandlers {
|
public interface HasInputRequestEventHandler extends HasHandlers {
|
||||||
public HandlerRegistration addInputRequestEventHandler(
|
public HandlerRegistration addInputRequestEventHandler(InputRequestEventHandler handler);
|
||||||
InputRequestEventHandler handler);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public InputRequestEvent() {
|
public InputRequestEvent() {
|
||||||
|
requested = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -41,19 +40,13 @@ public class InputRequestEvent extends
|
||||||
return TYPE;
|
return TYPE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Type<InputRequestEventHandler> getType() {
|
public boolean isRequested() {
|
||||||
return TYPE;
|
return requested;
|
||||||
}
|
|
||||||
|
|
||||||
public static void fire(HasHandlers source, InputRequestEvent inputSaveEvent) {
|
|
||||||
source.fireEvent(inputSaveEvent);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "InputRequestEvent []";
|
return "InputRequestEvent [requested=" + requested + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -375,7 +375,7 @@ public class ProjectManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void softwareCreate(final InputData inputData, final StatAlgoImporterMonitor monitor) {
|
public void softwareCreate(final InputData inputData, final StatAlgoImporterMonitor monitor) {
|
||||||
|
Log.debug("SoftwareCreate On Server");
|
||||||
StatAlgoImporterServiceAsync.INSTANCE.createSoftware(inputData, new AsyncCallback<Project>() {
|
StatAlgoImporterServiceAsync.INSTANCE.createSoftware(inputData, new AsyncCallback<Project>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -390,14 +390,13 @@ public class ProjectManager {
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
monitor.hide();
|
monitor.hide();
|
||||||
if (caught instanceof StatAlgoImporterSessionExpiredException) {
|
if (caught instanceof StatAlgoImporterSessionExpiredException) {
|
||||||
|
Log.error("Session Expired");
|
||||||
eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER));
|
eventBus.fireEvent(new SessionExpiredEvent(SessionExpiredType.EXPIREDONSERVER));
|
||||||
} else {
|
} else {
|
||||||
Log.error("Error in create software: " + caught.getLocalizedMessage());
|
Log.error("Error in create software: " + caught.getLocalizedMessage(),caught);
|
||||||
UtilsGXT3.alert("Error", caught.getLocalizedMessage());
|
UtilsGXT3.alert("Error", caught.getLocalizedMessage());
|
||||||
fireProjectStatusExplorerRefreshEvent();
|
fireProjectStatusExplorerRefreshEvent();
|
||||||
|
|
||||||
}
|
}
|
||||||
caught.printStackTrace();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -727,6 +726,7 @@ public class ProjectManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void softwarePublish(final StatAlgoImporterMonitor monitor) {
|
private void softwarePublish(final StatAlgoImporterMonitor monitor) {
|
||||||
|
Log.debug("SoftwarePublish invocation");
|
||||||
if (project != null) {
|
if (project != null) {
|
||||||
softwarePublishOnServer(monitor);
|
softwarePublishOnServer(monitor);
|
||||||
|
|
||||||
|
@ -740,7 +740,7 @@ public class ProjectManager {
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
private void softwarePublishOnServer(final StatAlgoImporterMonitor monitor) {
|
private void softwarePublishOnServer(final StatAlgoImporterMonitor monitor) {
|
||||||
Log.info("Software Publish On Server");
|
Log.info("SoftwarePublish On Server");
|
||||||
StatAlgoImporterServiceAsync.INSTANCE.publishSoftware(new AsyncCallback<String>() {
|
StatAlgoImporterServiceAsync.INSTANCE.publishSoftware(new AsyncCallback<String>() {
|
||||||
|
|
||||||
public void onFailure(Throwable caught) {
|
public void onFailure(Throwable caught) {
|
||||||
|
|
|
@ -420,7 +420,7 @@ public class HomeToolBar {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.error("setUI Error : " + e.getLocalizedMessage());
|
Log.error("setUI Error : " + e.getLocalizedMessage(),e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,6 +35,7 @@ public class ToolsPanel extends ContentPanel {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void init() {
|
protected void init() {
|
||||||
|
setId("ToolsPanel");
|
||||||
forceLayoutOnResize = true;
|
forceLayoutOnResize = true;
|
||||||
setHeaderVisible(false);
|
setHeaderVisible(false);
|
||||||
setResize(true);
|
setResize(true);
|
||||||
|
|
|
@ -73,7 +73,7 @@ public class InputVariablePanel extends ContentPanel {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInputRequest(InputRequestEvent event) {
|
public void onInputRequest(InputRequestEvent event) {
|
||||||
Log.debug("Catch InputRequestEvent");
|
Log.debug("InputVariablePanel Catch InputRequestEvent");
|
||||||
manageInputRequestEvents(event);
|
manageInputRequestEvents(event);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,10 @@ import com.sencha.gxt.widget.core.client.container.SimpleContainer;
|
||||||
public class WorkAreaPanel extends SimpleContainer {
|
public class WorkAreaPanel extends SimpleContainer {
|
||||||
|
|
||||||
private EventBus eventBus;
|
private EventBus eventBus;
|
||||||
|
private static MainDataPanel mainDataPanel;
|
||||||
|
private static ToolsPanel toolsPanel;
|
||||||
|
private static BorderLayoutContainer mainPanelLayout;
|
||||||
|
|
||||||
public WorkAreaPanel(EventBus eventBus) {
|
public WorkAreaPanel(EventBus eventBus) {
|
||||||
super();
|
super();
|
||||||
this.eventBus = eventBus;
|
this.eventBus = eventBus;
|
||||||
|
@ -44,6 +47,7 @@ public class WorkAreaPanel extends SimpleContainer {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void create() {
|
private void create() {
|
||||||
|
Log.debug("WorkAreaPanel created");
|
||||||
// addStyleName(StatAlgoImporterResources.INSTANCE.saiStyles().getWorkAreaPanel());
|
// addStyleName(StatAlgoImporterResources.INSTANCE.saiStyles().getWorkAreaPanel());
|
||||||
// Image logo = new Image(StatAlgoImporterResources.INSTANCE.saiLogo());
|
// Image logo = new Image(StatAlgoImporterResources.INSTANCE.saiLogo());
|
||||||
// logo.addStyleName(StatAlgoImporterResources.INSTANCE.saiStyles().getLogo());
|
// logo.addStyleName(StatAlgoImporterResources.INSTANCE.saiStyles().getLogo());
|
||||||
|
@ -113,25 +117,25 @@ public class WorkAreaPanel extends SimpleContainer {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createBlackBoxArea(Project project) {
|
private void createBlackBoxArea(Project project) {
|
||||||
ToolsPanel toolsPanel = new ToolsPanel(eventBus);
|
toolsPanel = new ToolsPanel(eventBus);
|
||||||
clear();
|
clear();
|
||||||
add(toolsPanel);
|
add(toolsPanel);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createRArea(Project project) {
|
private void createRArea(Project project) {
|
||||||
// Main Panel
|
// Main Panel
|
||||||
BorderLayoutContainer mainPanelLayout = new BorderLayoutContainer();
|
mainPanelLayout = new BorderLayoutContainer();
|
||||||
// mainPanelLayout.setId("mainPanelLayout");
|
// mainPanelLayout.setId("mainPanelLayout");
|
||||||
mainPanelLayout.setBorders(false);
|
mainPanelLayout.setBorders(false);
|
||||||
mainPanelLayout.setResize(true);
|
mainPanelLayout.setResize(true);
|
||||||
|
|
||||||
// Main
|
// Main
|
||||||
final MainDataPanel mainDataPanel = new MainDataPanel(eventBus);
|
mainDataPanel = new MainDataPanel(eventBus);
|
||||||
MarginData mainData = new MarginData(new Margins(2));
|
MarginData mainData = new MarginData(new Margins(2));
|
||||||
mainPanelLayout.setCenterWidget(mainDataPanel, mainData);
|
mainPanelLayout.setCenterWidget(mainDataPanel, mainData);
|
||||||
|
|
||||||
// Right
|
// Right
|
||||||
ToolsPanel toolsPanel = new ToolsPanel(eventBus);
|
toolsPanel = new ToolsPanel(eventBus);
|
||||||
BorderLayoutData eastData = new BorderLayoutData(500);
|
BorderLayoutData eastData = new BorderLayoutData(500);
|
||||||
eastData.setCollapsible(true);
|
eastData.setCollapsible(true);
|
||||||
eastData.setSplit(false);
|
eastData.setSplit(false);
|
||||||
|
@ -151,18 +155,18 @@ public class WorkAreaPanel extends SimpleContainer {
|
||||||
|
|
||||||
private void createBashArea(Project project) {
|
private void createBashArea(Project project) {
|
||||||
// Main Panel
|
// Main Panel
|
||||||
BorderLayoutContainer mainPanelLayout = new BorderLayoutContainer();
|
mainPanelLayout = new BorderLayoutContainer();
|
||||||
// mainPanelLayout.setId("mainPanelLayout");
|
// mainPanelLayout.setId("mainPanelLayout");
|
||||||
mainPanelLayout.setBorders(false);
|
mainPanelLayout.setBorders(false);
|
||||||
mainPanelLayout.setResize(true);
|
mainPanelLayout.setResize(true);
|
||||||
|
|
||||||
// Main
|
// Main
|
||||||
final MainDataPanel mainDataPanel = new MainDataPanel(eventBus);
|
mainDataPanel = new MainDataPanel(eventBus);
|
||||||
MarginData mainData = new MarginData(new Margins(2));
|
MarginData mainData = new MarginData(new Margins(2));
|
||||||
mainPanelLayout.setCenterWidget(mainDataPanel, mainData);
|
mainPanelLayout.setCenterWidget(mainDataPanel, mainData);
|
||||||
|
|
||||||
// Right
|
// Right
|
||||||
ToolsPanel toolsPanel = new ToolsPanel(eventBus);
|
toolsPanel = new ToolsPanel(eventBus);
|
||||||
BorderLayoutData eastData = new BorderLayoutData(500);
|
BorderLayoutData eastData = new BorderLayoutData(500);
|
||||||
eastData.setCollapsible(true);
|
eastData.setCollapsible(true);
|
||||||
eastData.setSplit(false);
|
eastData.setSplit(false);
|
||||||
|
@ -174,10 +178,9 @@ public class WorkAreaPanel extends SimpleContainer {
|
||||||
mainPanelLayout.setEastWidget(toolsPanel, eastData);
|
mainPanelLayout.setEastWidget(toolsPanel, eastData);
|
||||||
toolsPanel.enable();
|
toolsPanel.enable();
|
||||||
toolsPanel.collapse();
|
toolsPanel.collapse();
|
||||||
|
|
||||||
clear();
|
clear();
|
||||||
add(mainPanelLayout);
|
add(mainPanelLayout);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void fireProjectStatusOpenEvent(final Project project) {
|
private void fireProjectStatusOpenEvent(final Project project) {
|
||||||
|
|
|
@ -772,7 +772,7 @@ public class FilesStorage {
|
||||||
if (folderItem instanceof SharedFolder) {
|
if (folderItem instanceof SharedFolder) {
|
||||||
SharedFolder sharedFolder = (SharedFolder) folderItem;
|
SharedFolder sharedFolder = (SharedFolder) folderItem;
|
||||||
Metadata metadata = sharedFolder.getUsers();
|
Metadata metadata = sharedFolder.getUsers();
|
||||||
shared = new ArrayList<>(metadata.getValues().keySet());
|
shared = new ArrayList<>(metadata.getMap().keySet());
|
||||||
} else {
|
} else {
|
||||||
logger.error("The folder is shared but is not of type SharedFolder: [itemId=" + itemId + "]");
|
logger.error("The folder is shared but is not of type SharedFolder: [itemId=" + itemId + "]");
|
||||||
if (folderItem.getOwner() != null && !folderItem.getOwner().isEmpty()) {
|
if (folderItem.getOwner() != null && !folderItem.getOwner().isEmpty()) {
|
||||||
|
|
|
@ -22,8 +22,7 @@
|
||||||
<!-- <inherits name="com.google.gwt.logging.Logging" /> -->
|
<!-- <inherits name="com.google.gwt.logging.Logging" /> -->
|
||||||
<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
|
<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
|
||||||
|
|
||||||
<!-- Debug CSS style
|
<!-- Debug CSS style <set-configuration-property name="CssResource.style"
|
||||||
<set-configuration-property name="CssResource.style"
|
|
||||||
value="pretty" /> -->
|
value="pretty" /> -->
|
||||||
|
|
||||||
<inherits name='org.gcube.portal.clientcontext.GCubeClientContext' />
|
<inherits name='org.gcube.portal.clientcontext.GCubeClientContext' />
|
||||||
|
@ -38,8 +37,8 @@
|
||||||
|
|
||||||
<!-- inherits GitHub Connector -->
|
<!-- inherits GitHub Connector -->
|
||||||
<inherits name="org.gcube.portlets.widgets.githubconnector.githubman" />
|
<inherits name="org.gcube.portlets.widgets.githubconnector.githubman" />
|
||||||
|
|
||||||
|
|
||||||
<!-- Specify the app entry point class. -->
|
<!-- Specify the app entry point class. -->
|
||||||
<entry-point
|
<entry-point
|
||||||
class='org.gcube.portlets.user.statisticalalgorithmsimporter.client.StatAlgoImporter' />
|
class='org.gcube.portlets.user.statisticalalgorithmsimporter.client.StatAlgoImporter' />
|
||||||
|
@ -55,19 +54,17 @@
|
||||||
name="locale" values="es" /> <set-property name="locale" value="en, it, es"
|
name="locale" values="es" /> <set-property name="locale" value="en, it, es"
|
||||||
/> <set-property-fallback name="locale" value="en" /> -->
|
/> <set-property-fallback name="locale" value="en" /> -->
|
||||||
|
|
||||||
<!--
|
<!-- <set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property
|
||||||
<set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property
|
|
||||||
name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger"
|
name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger"
|
||||||
value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED"
|
value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED"
|
||||||
/> -->
|
/> -->
|
||||||
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="ENABLED"
|
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="ENABLED"
|
||||||
/> -->
|
/> -->
|
||||||
|
|
||||||
|
|
||||||
<set-property name="log_ConsoleLogger" value="DISABLED" />
|
<set-property name="log_ConsoleLogger" value="DISABLED" />
|
||||||
<set-property name="log_DivLogger" value="DISABLED" />
|
<set-property name="log_DivLogger" value="DISABLED" />
|
||||||
<set-property name="log_GWTLogger" value="DISABLED" />
|
<set-property name="log_GWTLogger" value="DISABLED" />
|
||||||
<set-property name="log_SystemLogger" value="DISABLED" />
|
<set-property name="log_SystemLogger" value="DISABLED" />
|
||||||
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="DISABLED"
|
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="DISABLED"
|
||||||
/> -->
|
/> -->
|
||||||
|
|
||||||
|
|
|
@ -23,9 +23,8 @@
|
||||||
<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
|
<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
|
||||||
|
|
||||||
<!-- Debug CSS style -->
|
<!-- Debug CSS style -->
|
||||||
<!--
|
<!-- <set-configuration-property name="CssResource.style" value="pretty"
|
||||||
<set-configuration-property name="CssResource.style"
|
/> -->
|
||||||
value="pretty" /> -->
|
|
||||||
|
|
||||||
<inherits name='org.gcube.portal.clientcontext.GCubeClientContext' />
|
<inherits name='org.gcube.portal.clientcontext.GCubeClientContext' />
|
||||||
<inherits name='edu.ycp.cs.dh.acegwt.acegwt' />
|
<inherits name='edu.ycp.cs.dh.acegwt.acegwt' />
|
||||||
|
@ -38,9 +37,8 @@
|
||||||
name="org.gcube.portlets.widgets.workspaceuploader.WorkspaceUploader" />
|
name="org.gcube.portlets.widgets.workspaceuploader.WorkspaceUploader" />
|
||||||
|
|
||||||
<!-- inherits GitHub Connector -->
|
<!-- inherits GitHub Connector -->
|
||||||
<inherits
|
<inherits name="org.gcube.portlets.widgets.githubconnector.githubman" />
|
||||||
name="org.gcube.portlets.widgets.githubconnector.githubman" />
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Specify the app entry point class. -->
|
<!-- Specify the app entry point class. -->
|
||||||
<entry-point
|
<entry-point
|
||||||
|
@ -57,19 +55,15 @@
|
||||||
name="locale" values="es" /> <set-property name="locale" value="en, it, es"
|
name="locale" values="es" /> <set-property name="locale" value="en, it, es"
|
||||||
/> <set-property-fallback name="locale" value="en" /> -->
|
/> <set-property-fallback name="locale" value="en" /> -->
|
||||||
|
|
||||||
<!--
|
<!-- <set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property
|
||||||
<set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property
|
|
||||||
name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger"
|
name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger"
|
||||||
value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED"
|
value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED"
|
||||||
/> -->
|
|
||||||
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="ENABLED"
|
|
||||||
/> -->
|
/> -->
|
||||||
|
|
||||||
|
|
||||||
<set-property name="log_ConsoleLogger" value="DISABLED" />
|
<set-property name="log_ConsoleLogger" value="DISABLED" />
|
||||||
<set-property name="log_DivLogger" value="DISABLED" />
|
<set-property name="log_DivLogger" value="DISABLED" />
|
||||||
<set-property name="log_GWTLogger" value="DISABLED" />
|
<set-property name="log_GWTLogger" value="DISABLED" />
|
||||||
<set-property name="log_SystemLogger" value="DISABLED" />
|
<set-property name="log_SystemLogger" value="DISABLED" />
|
||||||
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="DISABLED"
|
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="DISABLED"
|
||||||
/> -->
|
/> -->
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue