Commit Graph

1498 Commits

Author SHA1 Message Date
Melanie Retter
fbe29a8a87 Merge branch 'master' into
fix_dialog_window_must_not_close_after_save_if_duplicate_exists

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 14:46:23 +02:00
Melanie Retter
4d47a86285 Fix typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-24 14:26:46 +02:00
Kai Zimmermann
8ded4a29d2 Merge pull request #277 from bsinno/fix_unhandled_ConstraintViolationException
Fix unhandled constraint violation exception
2016-08-24 11:46:43 +02:00
Kai Zimmermann
b3db6e4ae2 Merge pull request #276 from bsinno/fix_remove_unnecessary_save
Removed unnecessary target info startus persistence.
2016-08-24 09:05:26 +02:00
Melanie Retter
75a404c95f Fix typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-22 15:00:21 +02:00
Melanie Retter
4e292d48b7 Fix typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-22 14:57:46 +02:00
SirWayne
7bd8b6554c Add javadoc
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-22 09:30:33 +02:00
SirWayne
ef8436d945 Merge branch 'fix_dialog_window_must_not_close_after_save_if_duplicate_exists' of https://github.com/bsinno/hawkbit.git into fix_dialog_window_must_not_close_after_save_if_duplicate_exists 2016-08-19 18:26:45 +02:00
SirWayne
0856b6db8c Merge branch 'fix_dialog_window_must_not_close_after_save_if_duplicate_exists' of https://github.com/bsinno/hawkbit.git into fix_dialog_window_must_not_close_after_save_if_duplicate_exists 2016-08-19 18:26:11 +02:00
SirWayne
9f9277d3ee Fix save and close order for common window dialog. Close the window
after the save action, because after the close action there is no UI
anymore. So an error cannot shown on the UI.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-19 18:25:50 +02:00
Gaurav
e7f5ae048a Fixed Sonar issue.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-19 18:25:43 +02:00
Gaurav
86111ac70c Fixed sonar issues.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-19 18:08:34 +02:00
SirWayne
fe113a4bc6 Fix save and close order for common window dialog. Close the window
after the save action, because after the close action there is no UI
anymore. So an error cannot shown on the UI.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-19 17:44:23 +02:00
Gaurav
6babfe3603 Merge branch 'fix_dialog_window_must_not_close_after_save_if_duplicate_exists' of https://github.com/bsinno/hawkbit/ into fix_dialog_window_must_not_close_after_save_if_duplicate_exists 2016-08-19 17:25:50 +02:00
Gaurav
f7f73ae12c Fixed the sonar issues.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-19 17:25:35 +02:00
Melanie Retter
4c143cf9d2 Add javaDoc, remove unused method parameter
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-19 16:23:53 +02:00
Gaurav
381254fa67 Fixed Sonar issues.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-19 15:34:29 +02:00
SirWayne
84c9296a70 Merge branch 'eclipse/master' into
fix_unhandled_ConstraintViolationException

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-19 14:38:28 +02:00
Melanie Retter
36fb2f2b54 Merge branch 'master' into
fix_dialog_window_must_not_close_after_save_if_duplicate_exists

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIWindowDecorator.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/CreateUpdateTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-19 14:29:15 +02:00
kaizimmerm
795515e0b7 Improve readability
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-08-19 14:22:12 +02:00
SirWayne
ac8fc06036 Validate all drag and drop events
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-19 13:44:49 +02:00
Michael Hirsch
3650b31c9e Merge pull request #273 from bsinno/fix-improve-code-quality
Minor code improvements
2016-08-19 13:22:12 +02:00
Dominic Schabel
01d5d5e931 Merge branch 'master' into fix-improve-code-quality
# Conflicts:
#	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java

Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-08-19 12:33:46 +02:00
Gaurav
a6345270f5 Merge branch 'master' into fix_dialog_window_must_not_close_after_save_if_duplicate_exists 2016-08-19 11:20:11 +02:00
Kai Zimmermann
bd5d532d60 Fixed missing controller poll update in case of EVENT. Fixed eventBus
duplicate event post.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-08-19 11:19:33 +02:00
Gaurav
b2c1e78c72 Fixed the sonar issues
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-19 11:17:18 +02:00
Gaurav
b80323caf9 Re-factored the code as per the sonar standards.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-19 10:44:12 +02:00
Michael Hirsch
9610c83085 Merge pull request #271 from bsinno/fix_upload_status_dialog_showing_all_files
add files to status dialog when receive upload
2016-08-19 08:22:09 +02:00
Michael Hirsch
37faa151f0 Merge pull request #272 from bsinno/fix_toomany_status_entries_dont_requeue
don't reject too many status entries exception
2016-08-19 08:19:15 +02:00
SirWayne
4585c55689 Set closable to false that to disable 1 cross
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-18 15:32:25 +02:00
SirWayne
d05b5ebc1f Rename builder methode for TextComponent. Fix to set textfield ids.
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-18 11:15:00 +02:00
Kai Zimmermann
09c329a485 Removed unnecessary target info startus persistence.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-08-18 10:34:43 +02:00
Michael Hirsch
630cf09162 add files to status dialog when receive upload
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-18 08:42:55 +02:00
Gaurav
b301f73aa4 # WARNING: head commit changed in the meantime
Signed-off-by:
2016-08-17 18:11:27 +02:00
Gaurav
c6c76332c0 Fixed the bug for textfield stays highlighted in red in the add
distribution window.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-17 18:05:35 +02:00
Dominic Schabel
b409e831f1 Merge branch 'master' into fix-improve-code-quality 2016-08-17 18:01:22 +02:00
Gaurav
47726690c4 # WARNING: head commit changed in the meantime
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-17 17:42:06 +02:00
Gaurav
fafaf54e37 Refactored the code to fix the sonar issues.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-17 17:36:45 +02:00
Michael Hirsch
17a2000333 Merge pull request #269 from bsinno/feature_allow_disable_amqp_interface_in_simulator
introduce property to disable amqp interface in simulator
2016-08-17 10:05:59 +02:00
SirWayne
e6f80756f1 Merge from master
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-17 09:34:59 +02:00
SirWayne
7ea17c54f1 Add TextBuilderArea
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-17 09:02:04 +02:00
SirWayne
8d7cdb7e13 Merge branch 'fix-improve-code-quality' of https://github.com/bsinno/hawkbit.git into fix-improve-code-quality 2016-08-16 17:33:27 +02:00
SirWayne
1d825f9c74 Add a textfield builder
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-16 17:33:06 +02:00
Melanie Retter
3e0c78e832 Remove unnecessary style from ActionButtonLayout of CommonDialogWindow
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-16 17:28:37 +02:00
Dominic Schabel
1094c3c12f Found another place where a NOT was missing
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-08-16 16:11:15 +02:00
Dominic Schabel
876c599617 Found another place where a NOT was missing
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-08-16 15:28:59 +02:00
SirWayne
6db64dd5df Merge master
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-16 15:27:45 +02:00
SirWayne
a4703ea0a8 Merge remote-tracking branch 'eclipse/master' into
fix-improve-code-quality

Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/DistributionSetMetadatadetailslayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-16 15:17:30 +02:00
SirWayne
9545ff5626 Merge branch 'fix-improve-code-quality' of https://github.com/bsinno/hawkbit.git into fix-improve-code-quality 2016-08-16 14:51:42 +02:00
SirWayne
8ccc9811a8 Add LabelBuilder
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-16 14:51:36 +02:00