Commit Graph

520 Commits

Author SHA1 Message Date
Dominic Schabel
a9e15041d8 Minor code improvements
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-08-15 18:16:55 +02:00
Dominic Schabel
3accac9ade Minor code improvements
Signed-off-by: Dominic Schabel dominic.schabel@bosch-si.com
2016-08-15 13:17:37 +02:00
Michael Hirsch
8c39fc98e0 Merge branch 'master' into Feature_Improve_Code_Quality 2016-08-09 17:54:11 +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
Michael Hirsch
c4b0bdfa86 Merge pull request #264 from bsinno/fix_concurrency_on_UI_causes_NullpointerException
Fix for the concurrency issue on UI causes on the Nullpointer Exception.
2016-08-08 08:49:21 +02:00
SirWayne
9febe16453 Fix sonar issue
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-05 16:42:09 +02:00
Gaurav
88c1253f66 Fix for the concurrency issue on UI causes on the Nullpointer Exception.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-05 16:02:20 +02:00
SirWayne
5f20066cff Fix sonar issue
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-05 15:55:49 +02:00
SirWayne
c71cf4852a fix sonar issues
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-05 14:58:17 +02:00
Jonathan Philip Knoblauch
f3f9dbc665 Added method to sync after upload
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-05 13:50:46 +02:00
Jonathan Philip Knoblauch
89605b0984 Changed error and how it is connected to current page
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-05 12:42:03 +02:00
SirWayne
88e5bdf8f4 Fix criticals sonar issues
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-05 10:51:11 +02:00
Gaurav
9bd47a5c55 Added the message in the message.properties.
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-05 10:49:24 +02:00
Gaurav
f964f7c0c6 Formatted the code
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-04 17:58:29 +02:00
Gaurav
303a668f16 Fix for the entity lock exception for unassign soft module from DS
Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>
2016-08-04 17:36:28 +02:00
Jonathan Philip Knoblauch
709ea990df Removed component that was not needed
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 16:19:35 +02:00
SirWayne
a1e939e233 Merge remote-tracking branch 'eclipse/master' into
Feature_Improve_Code_Quality

Conflicts:
	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


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-04 16:04:35 +02:00
Jonathan Philip Knoblauch
11bb282699 Refactoring for button enable
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 15:57:20 +02:00
Jonathan Philip Knoblauch
6be3d72a5a changed connector for error
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 13:57:06 +02:00
Jonathan Philip Knoblauch
cad916c1d7 Refactoring of bulk upload
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-04 10:04:08 +02:00
Jonathan Philip Knoblauch
5beb10b8db Removed uiNotification
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-03 17:51:52 +02:00
Jonathan Philip Knoblauch
43f71cc976 Catch RuntimeException and handle with Vaadin error handler
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-08-03 17:31:46 +02:00
Melanie Retter
b8bc46d299 Add JavaDoc
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-01 15:34:00 +02:00
Melanie Retter
c0a3a44277 Delete displayError in UiNotification
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-01 13:40:40 +02:00
Melanie Retter
26c376e22e Refactor HawkbitNotificationMessage
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-08-01 10:13:45 +02:00
Melanie Retter
27019b9e4c Beautify error notification.
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
2016-07-29 16:23:43 +02:00
Michael Hirsch
7a32d931b5 improve code quality
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 17:12:56 +02:00
Michael Hirsch
5ae190c8c3 improve code quality
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 17:11:04 +02:00
Michael Hirsch
2ad6f6946f improve code quality
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 16:19:14 +02:00
Gaurav
b919dd7146 Fix for the selenium testcase failure 2016-07-25 15:52:27 +02:00
Gaurav
b97f787a8a Formatted the code 2016-07-25 14:39:51 +02:00
Gaurav
e2d435b68c Merge branch 'master' into feature_multiunassignment_soft_mod
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
2016-07-25 14:05:18 +02:00
Michael Hirsch
b7ca552c2f Merge branch 'master' into Feature_Improve_Code_Quality 2016-07-25 13:36:18 +02:00
Michael Hirsch
ebf2c15da9 use private method getEntityFactory()
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 12:07:35 +02:00
Michael Hirsch
400c8bafcf move method to the right inner class
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:10:59 +02:00
Michael Hirsch
f3b472bcd2 Merge branch 'master' into Feature_Improve_Code_Quality
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/eventbus/CacheFieldEntityListener.java
	hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactBeanQuery.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:08:24 +02:00
GAH6KOR
79823b2930 Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-20 11:01:15 +02:00
gah6kor
85e22da7a2 Merge branch 'master' into feature_ui_metadata
Conflicts:
	hawkbit-ui/src/main/resources/messages.properties
2016-07-19 16:38:52 +02:00
Kai Zimmermann
ba177f77c0 Merge pull request #222 from bsinno/Fix_Consistent_context_menu_on_tables
Fix consistent context menu on tables
2016-07-19 14:50:02 +02:00
gah6kor
39a2e3ab20 Removed the discard and maximize buttons 2016-07-19 12:42:16 +02:00
gah6kor
a87a219540 Merge branch 'master' into feature_ui_metadata
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
2016-07-18 18:10:09 +02:00
gah6kor
63884c9fcd Formatted the code 2016-07-18 16:15:30 +02:00