VNotification now works without ApplicationConnection again. Dependencies needed by codeserver are now dependencies for client-compiler Error message now takes into account that devModeRedirect is enabled by default Change-Id: I079d162d9975f99fe7b91e14ad100459c80a5587tags/7.2.0
<dependency org="ant" name="ant-launcher" rev="1.6.5" | <dependency org="ant" name="ant-launcher" rev="1.6.5" | ||||
conf="build,ide -> default" /> | conf="build,ide -> default" /> | ||||
<dependency org="org.eclipse.jetty" name="jetty-server" | |||||
<dependency org="org.eclipse.jetty" name="jetty-distribution" | |||||
rev="8.1.12.v20130726" conf="build,ide -> default"> | rev="8.1.12.v20130726" conf="build,ide -> default"> | ||||
<exclude org="org.eclipse.jetty.orbit"></exclude> | <exclude org="org.eclipse.jetty.orbit"></exclude> | ||||
</dependency> | </dependency> | ||||
<dependency org="org.eclipse.jetty" name="jetty-util" | <dependency org="org.eclipse.jetty" name="jetty-util" | ||||
rev="8.1.12.v20130726" conf="build,ide -> default" /> | rev="8.1.12.v20130726" conf="build,ide -> default" /> | ||||
rev="1.1" conf="build,ide -> default" /> | rev="1.1" conf="build,ide -> default" /> | ||||
<dependency org="commons-codec" name="commons-codec" | <dependency org="commons-codec" name="commons-codec" | ||||
rev="1.8" conf="build,ide -> default" /> | rev="1.8" conf="build,ide -> default" /> | ||||
<dependency org="commons-io" name="commons-io" rev="${commons-io.version}" | |||||
conf="build,ide -> default" /> | |||||
<dependency org="commons-io" name="commons-io" | |||||
rev="${commons-io.version}" conf="build,ide -> default" /> | |||||
<dependency org="org.apache.commons" name="commons-lang3" | <dependency org="org.apache.commons" name="commons-lang3" | ||||
rev="3.1" conf="build,ide -> default" /> | rev="3.1" conf="build,ide -> default" /> | ||||
<dependency org="org.apache.james" name="apache-mime4j" | <dependency org="org.apache.james" name="apache-mime4j" |
// in super dev mode, as a result of the recompile, the enabled | // in super dev mode, as a result of the recompile, the enabled | ||||
// check will fail... | // check will fail... | ||||
if (!isSuperDevModeEnabledInModule()) { | if (!isSuperDevModeEnabledInModule()) { | ||||
showError("SuperDevMode is not enabled for this module/widgetset.<br/>" | |||||
+ "Ensure that your module definition (.gwt.xml) contains <br/>" | |||||
+ "<add-linker name="xsiframe"/><br/>" | |||||
+ "<set-configuration-property name="devModeRedirectEnabled" value="true" /><br/>"); | |||||
showError("SuperDevMode is disabled for this module/widgetset.<br/>" | |||||
+ "Ensure that your module definition (.gwt.xml) does not contain <br/>" | |||||
+ "<set-configuration-property name="devModeRedirectEnabled" value="false" /><br/>"); | |||||
return false; | return false; | ||||
} | } | ||||
return SuperDevMode.recompileIfNeeded(superDevModeParameter); | return SuperDevMode.recompileIfNeeded(superDevModeParameter); |
import com.vaadin.client.Util; | import com.vaadin.client.Util; | ||||
import com.vaadin.client.ui.aria.AriaHelper; | import com.vaadin.client.ui.aria.AriaHelper; | ||||
import com.vaadin.shared.Position; | import com.vaadin.shared.Position; | ||||
import com.vaadin.shared.ui.ui.NotificationRole; | |||||
import com.vaadin.shared.ui.ui.UIConstants; | import com.vaadin.shared.ui.ui.UIConstants; | ||||
import com.vaadin.shared.ui.ui.UIState.NotificationTypeConfiguration; | import com.vaadin.shared.ui.ui.UIState.NotificationTypeConfiguration; | ||||
import com.vaadin.shared.ui.ui.NotificationRole; | |||||
public class VNotification extends VOverlay { | public class VNotification extends VOverlay { | ||||
} | } | ||||
private boolean hasPostfix(NotificationTypeConfiguration styleSetup) { | private boolean hasPostfix(NotificationTypeConfiguration styleSetup) { | ||||
return styleSetup != null && styleSetup.postfix != null && !styleSetup.postfix.isEmpty(); | |||||
return styleSetup != null && styleSetup.postfix != null | |||||
&& !styleSetup.postfix.isEmpty(); | |||||
} | } | ||||
private boolean hasPrefix(NotificationTypeConfiguration styleSetup) { | private boolean hasPrefix(NotificationTypeConfiguration styleSetup) { | ||||
return styleSetup != null && styleSetup.prefix != null && !styleSetup.prefix.isEmpty(); | |||||
return styleSetup != null && styleSetup.prefix != null | |||||
&& !styleSetup.prefix.isEmpty(); | |||||
} | } | ||||
public void show(String html, Position position, String style) { | public void show(String html, Position position, String style) { | ||||
} | } | ||||
private NotificationTypeConfiguration getUiState(String style) { | private NotificationTypeConfiguration getUiState(String style) { | ||||
return getApplicationConnection() | |||||
.getUIConnector().getState().notificationConfigurations | |||||
if (getApplicationConnection() == null | |||||
|| getApplicationConnection().getUIConnector() == null) { | |||||
return null; | |||||
} | |||||
return getApplicationConnection().getUIConnector().getState().notificationConfigurations | |||||
.get(style); | .get(style); | ||||
} | } | ||||