blob: 5b6b7bff3756958bc246fb748a8b38dd8a7eeef4 [file] [log] [blame]
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> remove both of gwt-representer and gwt-dispatch dependencies, add license headers to all new files
/****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one *
* or more contributor license agreements. See the NOTICE file *
* distributed with this work for additional information *
* regarding copyright ownership. The ASF licenses this file *
* to you under the Apache License, Version 2.0 (the *
* "License"); you may not use this file except in compliance *
* with the License. You may obtain a copy of the License at *
* *
* http://www.apache.org/licenses/LICENSE-2.0 *
* *
* Unless required by applicable law or agreed to in writing, *
* software distributed under the License is distributed on an *
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
* KIND, either express or implied. See the License for the *
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
package org.apache.hupa.client.ui;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.DockLayoutPanel;
<<<<<<< HEAD
public interface AppLayout {
DockLayoutPanel getAppLayoutPanel();
AcceptsOneWidget getNorthContainer();
AcceptsOneWidget getWestContainer();
AcceptsOneWidget getCenterContainer();
void setLoginLayout();
void setDefaultLayout();
=======
package org.apache.hupa.client.ui;
=======
package org.apache.hupa.client.ui;
<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
=======
>>>>>>> introduce the top activity
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.LayoutPanel;
public interface AppLayout {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Change to new mvp framework - first step
LayoutPanel getMainLayoutPanel();
AcceptsOneWidget getWestContainer();
AcceptsOneWidget getMainContainer();
void setLoginLayout();
void setDefaultLayout();
<<<<<<< HEAD
>>>>>>> Change to new mvp framework - first step
=======
=======
>>>>>>> introduce the top activity
LayoutPanel getMainLayoutPanel();
=======
public interface AppLayout {
<<<<<<< HEAD
DockLayoutPanel getMainLayoutPanel();
>>>>>>> use DockLayoutPanel as the App Layout
AcceptsOneWidget getTopContainer();
=======
DockLayoutPanel getAppLayoutPanel();
AcceptsOneWidget getNorthContainer();
>>>>>>> use DataGrid instead of CellTable to list messages.
AcceptsOneWidget getWestContainer();
AcceptsOneWidget getCenterContainer();
void setLoginLayout();
void setDefaultLayout();
<<<<<<< HEAD
>>>>>>> introduce the top activity
=======
>>>>>>> Change to new mvp framework - first step
=======
>>>>>>> introduce the top activity
}