~slub.team/goobi-production/mq-interface-to-create-and-finalise-processes

« back to all changes in this revision

Viewing changes to src/org/goobi/webservice/processors/FinaliseStepProcessor.java

  • Committer: Matthias Ronge
  • Date: 2012-06-21 13:56:54 UTC
  • Revision ID: matthias.ronge@zeutschel.de-20120621135654-c1rcnm8nc02x026u
Fixed some NullPointerExceptions

Show diffs side-by-side

added added

removed removed

Lines of Context:
10
10
import de.sub.goobi.config.ConfigMain;
11
11
import de.sub.goobi.forms.AktuelleSchritteForm;
12
12
import de.sub.goobi.helper.Helper;
 
13
import de.sub.goobi.helper.exceptions.DAOException;
 
14
import de.sub.goobi.persistence.SchrittDAO;
13
15
 
14
16
/**
15
17
 * This is a web service interface to close steps. You have to provide the step
31
33
                dialog.SchrittDurchBenutzerAbschliessen();
32
34
        }
33
35
 
34
 
        protected AktuelleSchritteForm getStep(Integer stepID) {
 
36
        protected AktuelleSchritteForm getStep(Integer stepID) throws DAOException {
35
37
                AktuelleSchritteForm result = new AktuelleSchritteForm();
36
 
                Session hibernateSession = Helper.getHibernateSession();
37
 
                Criteria databaseRequest = hibernateSession.createCriteria(Schritt.class).add(Restrictions.eq("schritteID", stepID));
38
 
                Schritt step = (Schritt) databaseRequest.list().get(0);
 
38
//              Session hibernateSession = Helper.getHibernateSession();
 
39
//              Criteria databaseRequest = hibernateSession.createCriteria(Schritt.class).add(Restrictions.eq("id", stepID));
 
40
//              Schritt step = (Schritt) databaseRequest.list().get(0);
 
41
                Schritt step = new SchrittDAO().get(stepID);
39
42
                result.setMySchritt(step);
40
43
                return result;
41
44
        }
42
45
 
43
46
        protected void addMessageToWikiField(AktuelleSchritteForm form, String message) {
44
 
                StringBuilder wikiField = new StringBuilder(form.getWikiField());
45
 
                if (wikiField.length() > 0)
46
 
                        wikiField.append("\r\n");
47
 
                wikiField.append("<p>");
48
 
                wikiField.append(message);
49
 
                wikiField.append("</p>");
50
 
                form.setWikiField(wikiField.toString());
 
47
                StringBuilder composer = new StringBuilder();
 
48
                String wikiField = form.getWikiField();
 
49
                if (wikiField != null && wikiField.length() > 0){
 
50
                        composer.append(wikiField);
 
51
                        composer.append("\r\n");
 
52
                }
 
53
                composer.append("<p>");
 
54
                composer.append(message);
 
55
                composer.append("</p>");
 
56
                form.setWikiField(composer.toString());
51
57
                return;
52
58
        }
53
59