Fixed Ribbon and pom
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@84498 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
e40fec6316
commit
0e18e48315
11
pom.xml
11
pom.xml
|
@ -211,14 +211,9 @@
|
|||
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
|
||||
<!-- TD Service Mock -->
|
||||
<dependency>
|
||||
<groupId>org.gcube.data.analysis.tabulardata</groupId>
|
||||
<artifactId>service-client-mock</artifactId>
|
||||
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Home Library -->
|
||||
|
||||
<!-- Home Library
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>home-library-jcr</artifactId>
|
||||
|
@ -227,7 +222,7 @@
|
|||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>home-library</artifactId>
|
||||
</dependency>
|
||||
|
||||
-->
|
||||
|
||||
<!-- LOGGING -->
|
||||
<dependency>
|
||||
|
|
|
@ -149,21 +149,6 @@ public class TabularDataPortlet implements EntryPoint {
|
|||
controller.setFunctionalityPanel(functionalityPanel);
|
||||
controller.setEastData(eastData);
|
||||
|
||||
// Main
|
||||
// SimpleContainer mainPanel = new SimpleContainer();
|
||||
// mainPanelLayout.clearSizeCache();
|
||||
// mainPanelLayout.forceLayout();
|
||||
|
||||
/*
|
||||
* mainPanel.add(toolBarPanel);
|
||||
* Log.info("toolBarPanel height: "+toolBarPanel.getOffsetHeight());
|
||||
* Log.info("toolBarPanel width: "+toolBarPanel.getOffsetWidth());
|
||||
*
|
||||
* // updateSize(); try { RootPanel.get(JSP_TAG_ID).add(mainPanel); }
|
||||
* catch (Exception e) { e.printStackTrace();
|
||||
* Log.error("Tabular Data Portlet: error " + e.getLocalizedMessage());
|
||||
* }
|
||||
*/
|
||||
bind(mainPanelLayout);
|
||||
|
||||
}
|
||||
|
@ -177,6 +162,7 @@ public class TabularDataPortlet implements EntryPoint {
|
|||
+ " not found, starting in dev mode");
|
||||
Viewport viewport = new Viewport();
|
||||
viewport.setWidget(mainWidget);
|
||||
viewport.onResize();
|
||||
RootPanel.get().add(viewport);
|
||||
} else {
|
||||
Log.info("Application div with id " + JSP_TAG_ID
|
||||
|
@ -187,14 +173,7 @@ public class TabularDataPortlet implements EntryPoint {
|
|||
Log.info("Set Widget");
|
||||
Log.info("getOffsetWidth(): " + viewport.getOffsetWidth());
|
||||
Log.info("getOffsetHeight(): " + viewport.getOffsetHeight());
|
||||
/*viewport.addResizeHandler(new ResizeHandler() {
|
||||
|
||||
@Override
|
||||
public void onResize(ResizeEvent event) {
|
||||
viewport.resize();
|
||||
}
|
||||
});*/
|
||||
|
||||
viewport.onResize();
|
||||
root.add(viewport);
|
||||
Log.info("Added viewport to root");
|
||||
}
|
||||
|
|
|
@ -54,6 +54,7 @@ public class ChartsToolBar {
|
|||
{
|
||||
toolBar = new ToolBar();
|
||||
toolBar.setSpacing(1);
|
||||
toolBar.setEnableOverflow(false);
|
||||
|
||||
//Charts Group
|
||||
ButtonGroup chartsGroup = new ButtonGroup();
|
||||
|
|
|
@ -68,6 +68,8 @@ public class FileToolBar {
|
|||
protected void build() {
|
||||
toolBar = new ToolBar();
|
||||
toolBar.setSpacing(1);
|
||||
toolBar.setEnableOverflow(false);
|
||||
|
||||
|
||||
// File
|
||||
ButtonGroup fileGroup = new ButtonGroup();
|
||||
|
|
|
@ -62,6 +62,7 @@ public class FormulasToolBar {
|
|||
{
|
||||
toolBar = new ToolBar();
|
||||
toolBar.setSpacing(1);
|
||||
toolBar.setEnableOverflow(false);
|
||||
|
||||
|
||||
//Table Group
|
||||
|
|
|
@ -46,7 +46,7 @@ public class ReviewToolBar {
|
|||
protected void build() {
|
||||
toolBar = new ToolBar();
|
||||
toolBar.setSpacing(1);
|
||||
|
||||
toolBar.setEnableOverflow(false);
|
||||
|
||||
// Validation
|
||||
ButtonGroup validationGroup = new ButtonGroup();
|
||||
|
|
|
@ -33,26 +33,27 @@ public class TabularDataRibbon {
|
|||
ribbon.setId("Ribbon");
|
||||
ribbon.setHeight("106px");
|
||||
|
||||
VerticalLayoutData vldata=new VerticalLayoutData(1, -1);
|
||||
|
||||
fileToolBar = new FileToolBar(eventBus);
|
||||
VerticalLayoutContainer con = new VerticalLayoutContainer();
|
||||
con.add(fileToolBar.getToolBar(), new VerticalLayoutData(1, -1));
|
||||
con.add(fileToolBar.getToolBar(), vldata);
|
||||
ribbon.add(con, "Home");
|
||||
|
||||
reviewToolBar = new ReviewToolBar(eventBus);
|
||||
con = new VerticalLayoutContainer();
|
||||
|
||||
con.add(reviewToolBar.getToolBar(), new VerticalLayoutData(1, -1));
|
||||
con.add(reviewToolBar.getToolBar(), vldata);
|
||||
ribbon.add(con, "Review");
|
||||
|
||||
formulasToolBar = new FormulasToolBar(eventBus);
|
||||
con = new VerticalLayoutContainer();
|
||||
con.add(formulasToolBar.getToolBar(), new VerticalLayoutData(1, -1));
|
||||
con.add(formulasToolBar.getToolBar(), vldata);
|
||||
ribbon.add(con, "Modify");
|
||||
|
||||
chartsToolBar = new ChartsToolBar(eventBus);
|
||||
con = new VerticalLayoutContainer();
|
||||
con.add(chartsToolBar.getToolBar(), new VerticalLayoutData(1, -1));
|
||||
con.add(chartsToolBar.getToolBar(), vldata);
|
||||
ribbon.add(con, "Applications");
|
||||
|
||||
} catch (Exception e) {
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
<!-- Specify the app entry point class. -->
|
||||
<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
|
||||
|
||||
<set-property name="log_DivLogger" value="ENABLED" />
|
||||
<set-property name="log_DivLogger" value="DISABLED" />
|
||||
<set-property name="log_ConsoleLogger" value="ENABLED" />
|
||||
<set-property name="log_FirebugLogger" value="ENABLED" />
|
||||
<set-property name="log_GWTLogger" value="ENABLED" />
|
||||
|
|
Loading…
Reference in New Issue