Commit Graph

1445 Commits

Author SHA1 Message Date
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
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
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
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
Michael Hirsch
a84a3b9dae Merge pull request #236 from bsinno/feature_enable_push_in_deployment_view
Enable push for update target, create/update/delete ds
2016-08-16 13:21:33 +02:00
Michael Hirsch
79e0cccfa9 remove not used class
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-16 12:29:14 +02:00
Gaurav
75905472c8 Fix for the dialog window must not close after save if duplicate exists.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-15 15:38:08 +02:00
Michael Hirsch
7164b33e94 don't generate amqp devices at startup if amqp is disabled
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-15 15:33:18 +02:00
Michael Hirsch
9d54aa8c34 grammar corrected
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-15 15:16:02 +02:00
Michael Hirsch
196ce5643e don't send amqp message when protocol is DDI
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-15 14:33:03 +02:00
Gaurav
86f13452c5 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-15 11:42:03 +02:00
Michael Hirsch
d89b6993d4 Merge pull request #270 from bsinno/fix_lock_session_on_show_error_notification
Show error notification needs a lock when run in separate thread
2016-08-12 19:17:14 +02:00
Jonathan Philip Knoblauch
971b0aecb6 Refactoring error handler
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-12 16:08:44 +02:00
Jonathan Philip Knoblauch
5d250a03be Refactoring for error handler
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-12 14:28:25 +02:00
Michael Hirsch
e8393af749 adapt manifest
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-12 09:54:18 +02:00
Melanie Retter
c3145bed58 Refactor: Log message can be overwritten
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 17:51:39 +02:00
Melanie Retter
643eb23839 Revert method deletion
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 16:25:12 +02:00
Melanie Retter
92fb82129a Refactoring HawkbitUiErrorHandler
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 16:05:22 +02:00
Melanie Retter
0d632d598a Delete empty rows in Java Doc
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 14:33:34 +02:00
Melanie Retter
ff39ecfc75 Correct typo
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 14:15:19 +02:00
Gaurav
4534ece860 Fixed the issue of refreshing the tag details section for the
distributions.

Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-11 14:03:40 +02:00
Melanie Retter
6205126279 Lock is only needed when BulkUpload
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 13:54:28 +02:00
Melanie Retter
3ec569f259 Merge branch 'fix_lock_session_on_show_error_notification' of
https://github.com/bsinno/hawkbit.git into
fix_lock_session_on_show_error_notification

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/HawkbitUIErrorHandler.java


Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 13:29:31 +02:00
Melanie Retter
9cc63ce128 Refactor UI Error Handler. Need to put UI in constructor. So the message
is shown in the same browser window.

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-11 13:25:24 +02:00
Michael Hirsch
25fb8e5514 introduce property to disable amqp interface in simulator
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-11 09:50:38 +02:00
Gaurav
0e6d21c84a Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-10 17:20:28 +02:00
Michael Hirsch
7f156f05a4 Merge pull request #268 from bsinno/fix_json_creator_ddideploymentbase
add json-creator to DdiDeploymentBase
2016-08-10 14:42:12 +02:00
Michael Hirsch
b53f4fc74f add json-creator to DdiDeploymentBase
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-10 14:42:03 +02:00
Gaurav
d7539de64d Merge branch 'master' into feature_enable_push_in_deployment_view
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/eventbus/event/TargetDeletedEvent.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleMetadatadetailslayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java


Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-10 11:44:23 +02:00
Michael Hirsch
913692f947 lock session on error showing error notification
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-10 09:22:57 +02:00
Michael Hirsch
785dc5f208 Merge pull request #266 from bsinno/Feature_Improve_Code_Quality
Improve code quality
2016-08-10 08:07:51 +02:00
Michael Hirsch
8c39fc98e0 Merge branch 'master' into Feature_Improve_Code_Quality 2016-08-09 17:54:11 +02:00
Gaurav
894e9dc3cf Merge branch 'master' into feature_enable_push_in_deployment_view 2016-08-09 13:15:24 +02:00
Michael Hirsch
4baf8c6ce0 Merge pull request #267 from bsinno/fix_concurrency_on_UI_causes_NullpointerException
Fix concurrency on ui causes nullpointer exception
2016-08-09 11:51:14 +02:00
Michael Hirsch
df315bb42c remove tagToken from map
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-09 11:50:59 +02:00
Michael Hirsch
9cb1fe170b clear tagDetails in BulkUpload
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-09 11:50:18 +02:00
Dominic Schabel
d3edcb0044 Merge branch 'master' into Feature_Improve_Code_Quality
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
2016-08-09 09:02:33 +02:00
Michael Hirsch
c4c205ea27 Merge pull request #262 from bsinno/fix_enable_showing_errors_during_bulk_upload
Fix enable showing errors during bulk upload
2016-08-08 16:47:43 +02:00
Dominic Schabel
9c7db25197 Merge branch 'master' into Feature_Improve_Code_Quality
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java
2016-08-08 16:40:00 +02:00
Michael Hirsch
f4c642b401 Merge pull request #265 from bsinno/fix_concurrency_on_UI_causes_NullpointerException
clear the tagDetails map as well
2016-08-08 16:21:17 +02:00
Jonathan Philip Knoblauch
8a1207337b Changed buildNotification method that error log dosn't have to be displayed in all cases
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-08 16:15:55 +02:00
Michael Hirsch
adafaa9489 clear the tagDetails map as well
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-08 16:15:15 +02:00
Gaurav
8fa2a60a71 Formatted the code.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-08 13:30:16 +02:00
Gaurav
1afd98e157 Merge branch 'feature_enable_push_in_deployment_view' of https://github.com/bsinno/hawkbit/ into feature_enable_push_in_deployment_view 2016-08-08 13:25:13 +02:00
Gaurav
e42f8164a8 Incorporated the review comments.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-08 13:24:12 +02:00
Michael Hirsch
b3702672a3 add javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-08-08 09:14:48 +02:00