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

Fixed line endings

Browse Source 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
This commit is contained in:
Dominic Schabel
2016-06-10 10:45:28 +02:00
parent ed8827726c
commit 496fb5ff35
3 changed files with 198 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadFileStatus.java
View File

@@ -1,70 +1,70 @@
/** /**
* Copyright (c) 2015 Bosch Software Innovations GmbH and others. * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
* *
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
*/ */
package org.eclipse.hawkbit.ui.artifacts.event; package org.eclipse.hawkbit.ui.artifacts.event;
import java.io.Serializable; import java.io.Serializable;
import org.eclipse.hawkbit.repository.model.SoftwareModule; import org.eclipse.hawkbit.repository.model.SoftwareModule;
/** /**
* *
* Holds file and upload status details.Meta data sent with upload events. * Holds file and upload status details.Meta data sent with upload events.
* *
*/ */
public class UploadFileStatus implements Serializable { public class UploadFileStatus implements Serializable {
private static final long serialVersionUID = -3599629192216760811L; private static final long serialVersionUID = -3599629192216760811L;
private String fileName; private String fileName;
private long contentLength; private long contentLength;
private long bytesRead; private long bytesRead;
private String failureReason; private String failureReason;
private SoftwareModule softwareModule; private SoftwareModule softwareModule;
public UploadFileStatus(String fileName) { public UploadFileStatus(String fileName) {
this.fileName = fileName; this.fileName = fileName;
} }
public UploadFileStatus(String fileName, long bytesRead, long contentLength,SoftwareModule softwareModule) { public UploadFileStatus(String fileName, long bytesRead, long contentLength,SoftwareModule softwareModule) {
this.fileName = fileName; this.fileName = fileName;
this.contentLength = contentLength; this.contentLength = contentLength;
this.bytesRead = bytesRead; this.bytesRead = bytesRead;
this.softwareModule = softwareModule; this.softwareModule = softwareModule;
} }
public UploadFileStatus(String fileName, String failureReason,SoftwareModule selectedSw) { public UploadFileStatus(String fileName, String failureReason,SoftwareModule selectedSw) {
this.failureReason = failureReason; this.failureReason = failureReason;
this.fileName = fileName; this.fileName = fileName;
this.softwareModule = selectedSw; this.softwareModule = selectedSw;
} }
public String getFileName() { public String getFileName() {
return fileName; return fileName;
} }
public long getContentLength() { public long getContentLength() {
return contentLength; return contentLength;
} }
public long getBytesRead() { public long getBytesRead() {
return bytesRead; return bytesRead;
} }
public String getFailureReason() { public String getFailureReason() {
return failureReason; return failureReason;
} }
public SoftwareModule getSoftwareModule() { public SoftwareModule getSoftwareModule() {
return softwareModule; return softwareModule;
} }
} }

84
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/event/UploadStatusEvent.java
View File

@@ -1,42 +1,42 @@
/** /**
* Copyright (c) 2015 Bosch Software Innovations GmbH and others. * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
* *
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
*/ */
package org.eclipse.hawkbit.ui.artifacts.event; package org.eclipse.hawkbit.ui.artifacts.event;
/** /**
* *
* Holds the upload file status. * Holds the upload file status.
* *
*/ */
public class UploadStatusEvent { public class UploadStatusEvent {
public enum UploadStatusEventType { public enum UploadStatusEventType {
UPLOAD_FAILED, UPLOAD_IN_PROGRESS, UPLOAD_STARTED, UPLOAD_FINISHED, UPLOAD_SUCCESSFUL, UPLOAD_STREAMING_FAILED, UPLOAD_STREAMING_FINISHED, ABORT_UPLOAD UPLOAD_FAILED, UPLOAD_IN_PROGRESS, UPLOAD_STARTED, UPLOAD_FINISHED, UPLOAD_SUCCESSFUL, UPLOAD_STREAMING_FAILED, UPLOAD_STREAMING_FINISHED, ABORT_UPLOAD
} }
private UploadStatusEventType uploadProgressEventType; private UploadStatusEventType uploadProgressEventType;
private UploadFileStatus uploadStatus; private UploadFileStatus uploadStatus;
public UploadStatusEvent(UploadStatusEventType eventType, UploadFileStatus entity) { public UploadStatusEvent(UploadStatusEventType eventType, UploadFileStatus entity) {
this.uploadProgressEventType = eventType; this.uploadProgressEventType = eventType;
this.uploadStatus = entity; this.uploadStatus = entity;
} }
public UploadFileStatus getUploadStatus() { public UploadFileStatus getUploadStatus() {
return uploadStatus; return uploadStatus;
} }
public void setUploadStatus(UploadFileStatus uploadStatus) { public void setUploadStatus(UploadFileStatus uploadStatus) {
this.uploadStatus = uploadStatus; this.uploadStatus = uploadStatus;
} }
public UploadStatusEventType getUploadProgressEventType() { public UploadStatusEventType getUploadProgressEventType() {
return uploadProgressEventType; return uploadProgressEventType;
} }
} }

172
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java
View File

@@ -1,86 +1,86 @@
/** /**
* Copyright (c) 2015 Bosch Software Innovations GmbH and others. * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
* *
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
*/ */
package org.eclipse.hawkbit.ui.artifacts.upload; package org.eclipse.hawkbit.ui.artifacts.upload;
import org.eclipse.hawkbit.repository.model.SoftwareModule; import org.eclipse.hawkbit.repository.model.SoftwareModule;
/** /**
* *
* Holds uploaded file status.Used to display the details in upload status * Holds uploaded file status.Used to display the details in upload status
* popup. * popup.
* *
*/ */
public class UploadStatusObject { public class UploadStatusObject {
private String status; private String status;
private Double progress; private Double progress;
private String filename; private String filename;
private String reason; private String reason;
private SoftwareModule selectedSoftwareModule; private SoftwareModule selectedSoftwareModule;
public UploadStatusObject(final String status, final Double progress, final String fileName, final String reason, public UploadStatusObject(final String status, final Double progress, final String fileName, final String reason,
final SoftwareModule selectedSoftwareModule) { final SoftwareModule selectedSoftwareModule) {
this(fileName,selectedSoftwareModule); this(fileName,selectedSoftwareModule);
this.status = status; this.status = status;
this.progress = progress; this.progress = progress;
this.reason = reason; this.reason = reason;
} }
public UploadStatusObject(String fileName, SoftwareModule selectedSoftwareModule) { public UploadStatusObject(String fileName, SoftwareModule selectedSoftwareModule) {
this.filename = fileName; this.filename = fileName;
this.selectedSoftwareModule = selectedSoftwareModule; this.selectedSoftwareModule = selectedSoftwareModule;
} }
public SoftwareModule getSelectedSoftwareModule() { public SoftwareModule getSelectedSoftwareModule() {
return selectedSoftwareModule; return selectedSoftwareModule;
} }
public String getStatus() { public String getStatus() {
return status; return status;
} }
public void setStatus(String status) { public void setStatus(String status) {
this.status = status; this.status = status;
} }
public Double getProgress() { public Double getProgress() {
return progress; return progress;
} }
public void setProgress(Double progress) { public void setProgress(Double progress) {
this.progress = progress; this.progress = progress;
} }
public String getFilename() { public String getFilename() {
return filename; return filename;
} }
public void setFilename(String filename) { public void setFilename(String filename) {
this.filename = filename; this.filename = filename;
} }
public String getReason() { public String getReason() {
return reason; return reason;
} }
public void setReason(String reason) { public void setReason(String reason) {
this.reason = reason; this.reason = reason;
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == null || obj == null) { if (this == null || obj == null) {
return false; return false;
} }
if (obj instanceof UploadStatusObject && this.getFilename() == ((UploadStatusObject) obj).getFilename()) { if (obj instanceof UploadStatusObject && this.getFilename() == ((UploadStatusObject) obj).getFilename()) {
return true; return true;
} }
return false; return false;
} }
} }