lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fixed the sonar issues

Browse Source 
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
This commit is contained in:
Gaurav
2016-08-19 11:17:18 +02:00
parent b80323caf9
commit b2c1e78c72
3 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIWindowDecorator.java
View File

@@ -43,14 +43,47 @@ public final class SPUIWindowDecorator {
* window id
* @param type
* window type
* @param content
* content in the window
* @param cancelButtonClickListener
* cancel button
* @param helpLink
* help link
* @param layout
* layout in the window
* @param i18n
* i18n for internationalization
* @return Window
*
*/
public static CommonDialogWindow getWindow(final String caption, final String id, final String type,
final Component content, final ClickListener cancelButtonClickListener, final String helpLink,
final AbstractLayout layout, final I18N i18n) {
return getWindow(caption, id, type, content, null, cancelButtonClickListener, helpLink, layout, i18n);
}
/**
* @param caption
* window caption
* @param id
* window id
* @param type
* window type
* @param content
* content in the window
* @param saveButtonClickListener
* save button
* @param cancelButtonClickListener
* cancel button
* @param helpLink
* help link
* @param layout
* layout in the window
* @param i18n
* i18n for internationalization
* @return window
*/
public static CommonDialogWindow getWindow(final String caption, final String id, final String type,
final Component content, final ClickListener saveButtonClickListener,
final ClickListener cancelButtonClickListener, final String helpLink, final AbstractLayout layout,

7
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
View File

@@ -183,6 +183,13 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
return window;
}
/**
* Returns Target Update window based on the selected Entity Id in the
* target table.
*
* @param entityId
* @return window
*/
public Window getWindow(final String entityId) {
populateValuesOfTarget(entityId);
getWindow();

16
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
View File

@@ -166,10 +166,10 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
public CommonDialogWindow getWindow() {
resetComponents();
final CommonDialogWindow window = SPUIWindowDecorator.getWindow(i18n.get("caption.configure.rollout"), null,
SPUIDefinitions.CREATE_UPDATE_WINDOW, this, null,
final CommonDialogWindow commonDialogWindow = SPUIWindowDecorator.getWindow(
i18n.get("caption.configure.rollout"), null, SPUIDefinitions.CREATE_UPDATE_WINDOW, this, null,
uiProperties.getLinks().getDocumentation().getRolloutView(), this, i18n);
window.setSaveDialogCloseListener(new SaveDialogCloseListener() {
commonDialogWindow.setSaveDialogCloseListener(new SaveDialogCloseListener() {
@Override
public void saveOrUpdate() {
@@ -189,7 +189,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
return duplicateCheck();
}
});
return window;
return commonDialogWindow;
}
/**
@@ -513,14 +513,6 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
return errorThresoldPercent;
}
private boolean validateFields() {
if (!noOfGroups.isValid() || !errorThreshold.isValid() || !triggerThreshold.isValid()) {
uiNotification.displayValidationError(i18n.get("message.correct.invalid.value"));
return false;
}
return true;
}
private boolean duplicateCheck() {
if (rolloutManagement.findRolloutByName(getRolloutName()) != null) {
uiNotification.displayValidationError(